Merge pull request #4 from itcc-li/sprint2

Sprint2
Merged
Merge pull request #5 from itcc-li/sprint2

Sprint2
Merge pull request #6 from stevebo/sprint2

Sprint2
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 pull request #7 from itcc-li/sprint2

Sprint2
Merge pull request #8 from itcc-li/sprint2

Sprint2
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
variablen Namen
Richtige Fragen ergänzt
Merge pull request #39 from Arthur26/sprint2

Sprint2
Merge pull request #10 from itcc-li/sprint2

Sprint2
Steves newest version
Merge branch 'sprint3' into sprint2

Conflicts:
	Hackathon[2014]/res/values/strings.xml
Merge pull request #40 from stevebo/sprint2

steves newest version
Merge pull request #11 from itcc-li/sprint2

Merge pull request #40 from stevebo/sprint2
layout
Merge pull request #41 from stevebo/sprint2

Sprint2