Merged
mainActivity
Merge branch 'sprint2' into sprint3

Conflicts solved:
	Hackathon[2014]/res/layout/fragment_question.xml
	Hackathon[2014]/res/values/strings.xml
	Hackathon[2014]/src/li/itcc/hackathon2014/vaduztour/QuestionFragment.java
Merge branch 'sprint3' of
https://github.com/stevebo/hackathon-2014-android.git into sprint3

Conflicts:
	Hackathon[2014]/res/values/strings.xml
Merge branch 'sprint3' of https://github.com/stevebo/hackathon-2014-android.git into sprint3
layout