some refactoring
Merge branch 'master' of
https://github.com/norenma/Projekt-grupp-11-2013.git

Conflicts:
	QuizWalk/src/se/chalmers/fonahano/quizwalk/activities/ActivityHelper.java
	QuizWalk/src/se/chalmers/fonahano/quizwalk/activities/EditQuizWalkGameActivity.java
	QuizWalk/src/se/chalmers/fonahano/quizwalk/activities/GameMenuActivity.java