Merge branch 'master' of https://github.com/esvit/bazalt

Conflicts:
	bower.json
	modules/bzUploader/directives/bzUploader.js