Merge branch 'post-demo-2-changes' into 'master'

beat/web/reports/migrations/0004_auto_20170410_1121.py

...eports/static/reports/app/controllers/groupsController.js

...eports/static/reports/app/controllers/reportController.js

beat/web/reports/static/reports/app/data/itemcontent.json

...eb/reports/static/reports/app/data/table_itemcontent.json

...eb/reports/static/reports/app/directives/addReportItem.js

.../reports/static/reports/app/directives/aliasExperiment.js

...reports/static/reports/app/directives/buttonDeleteItem.js

...reports/static/reports/app/directives/buttonExportItem.js

...b/reports/static/reports/app/directives/buttonSettings.js

...eports/static/reports/app/directives/edit/addGroupMenu.js

...eports/static/reports/app/directives/edit/addItemsMenu.js

...ports/static/reports/app/directives/edit/itemContainer.js

.../web/reports/static/reports/app/directives/edit/layout.js

...eports/static/reports/app/directives/edit/panelContent.js

...ts/static/reports/app/directives/edit/panelExperiments.js

.../reports/static/reports/app/directives/edit/panelItems.js

...eb/reports/static/reports/app/directives/edit/plotItem.js

.../static/reports/app/directives/edit/tableFieldSelector.js

...b/reports/static/reports/app/directives/edit/tableItem.js