Merge origin/master

Conflicts:
	app/modules/keep-notes/js/controllers/keep-note-edit-controller.js
Merge branch 'master' of https://github.com/Intermesh/intermesh-angular-framework

Conflicts:
	src/intermesh/image-upload-placeholder/image-upload-placeholder-directive.js