Register, Settings and Login is now consistent (using username, not
mail)
Complete game is working
Merge branch 'master' of
https://github.com/norenma/Projekt-grupp-11-2013.git

Conflicts:
	QuizWalk/src/se/chalmers/fonahano/quizwalk/presentation/RegisterUserActivity.java