New methods in the factories
Merge remote-tracking branch 'origin/master'

Conflicts:
	GamificationClient/js/controllers.js