Merge pull request #3 from itcc-li/sprint2

Sprint2
add intro
Merge pull request #6 from itcc-li/sprint2

Sprint2
add location
Merge branch 'sprint2' of https://github.com/Arthur26/hackathon-2014-android.git into sprint2
Merge pull request #18 from simonmeier/sprint2

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

Sprint2
Merge branch 'sprint2' of https://github.com/Arthur26/hackathon-2014-android.git into sprint2
Merge pull request #7 from itcc-li/sprint2

Sprint2
Added Compass
Merge branch 'sprint2' of https://github.com/schlafenderbiber/hackathon-2014-android.git into sprint2
Merge pull request #19 from schlafenderbiber/sprint2

Sprint2
added locationmanager and sculpturefragment
Merge pull request #8 from itcc-li/sprint2

Sprint2
Implement Navigation
Merge pull request #4 from itcc-li/sprint2

Sprint4
Merge branch 'sprint4' into sprint3

Conflicts:
	Hackathon[2014]/AndroidManifest.xml
	Hackathon[2014]/res/values/strings.xml
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
Merge branch 'sprint2' of
https://github.com/Arthur26/hackathon-2014-android.git into sprint2

Conflicts:
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
Merge pull request #20 from sandro-pedrett/sprint3

Sprint3
add finish callback