Merge remote-tracking branch 'origin/master' into doubles-ss_master

# Conflicts:
#	server/database.js

server/model/monitor.js

@@ -72,6 +72,7 @@ class Monitor extends BeanModel {
         let data = {
             id: this.id,
             name: this.name,
+            description: this.description,
             url: this.url,
             method: this.method,
             hostname: this.hostname,