Merge branch 'master' into image-upload(LBSD-22)

Conflicts:
	app/scripts/config.js
	app/scripts/liveblog-edit/module.js
	app/scripts/liveblog-edit/views/main.html
	bower.json