cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/scripts/core/collector/Collector.js
	app/scripts/core/collector/CollectorRepo.js
	app/scripts/core/enitityExtensions/image/configs/crop.js
	app/scripts/core/enitityExtensions/image/configs/default.js
	app/scripts/core/enitityExtensions/inline/medium/medium.js
	app/scripts/main.js
	app/styles/main.less
	bower.json