votes added
Merge branch 'develop' of https://github.com/izzappel/boom into develop

Conflicts:
	Boom_Mobile/www/js/controllers.js