Fixed images
Merge branch 'master' of https://github.com/Intermesh/intermesh-angular-framework

Conflicts:
	src/intermesh/image-upload-placeholder/image-upload-placeholder-directive.js
Added extra function to the trait to get the original file
New modal dialog
Merge branch 'master' of https://github.com/Intermesh/intermesh-angular-example

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

Conflicts:
	app/index.html
	app/modules/notes/js/controllers/note-edit-controller.js
Merge origin/master