Working on modals
Merge remote-tracking branch 'origin/master'

Conflicts:
	GamificationClient/templates/home.html