changes
Merge branch 'raven' of https://github.com/ludwiksh/Etales

Conflicts:
	app/js/utils/labelBase.js
fix problem in bower.json
update
Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
update