Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/watcherTasks.xml
	.idea/workspace.xml
	web/bower_components/bootstrap/docs-assets/js/raw-files.js
	web/index.scss