image upload
Merge branch 'kipur' of https://github.com/dabur/scanu into kipur

Conflicts:
	app/controllers/files.js
	config/config.js
	public/js/conf.js
	public/js/controllers.js
	public/js/directives.js
	public/partials/components/properties/image.html
fix 1