Strings to string.xml
Merge branch 'master' of
https://github.com/norenma/Projekt-grupp-11-2013.git

Conflicts:
	QuizWalk/src/se/chalmers/fonahano/quizwalk/activities/QuestionDialogBuilder.java
	QuizWalk/src/se/chalmers/fonahano/quizwalk/activities/QuizWalkActivity.java
Merge branch 'master' of
https://github.com/norenma/Projekt-grupp-11-2013.git

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