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

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