Fin ticket #49
Merge branch 'master' of https://github.com/haxakl/RunBelievable

Conflicts:
	Runbelievable/www/js/controller/AppController.js