Vertical tabs!
Merge remote-tracking branch 'origin/master'

Conflicts:
	GamificationClient/css/style.css