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

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

Sprint2
Implement Navigation
Merge branch 'sprint2' of
https://github.com/Arthur26/hackathon-2014-android.git into sprint2

Conflicts:
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
add finish callback
Merge pull request #9 from itcc-li/sprint2

Sprint2
Merge branch 'sprint2' of
https://github.com/Arthur26/hackathon-2014-android.git into sprint2

Conflicts:
	Hackathon[2014]/res/values/strings.xml
	Hackathon[2014]/src/li/itcc/hackathon2014/AbstractTourFragment.java
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
	Hackathon[2014]/src/li/itcc/hackathon2014/vaduztour/HotColdFragment.java
Merge pull request #22 from Arthur26/sprint2

Sprint2