add location
Merge branch 'sprint2' of https://github.com/Arthur26/hackathon-2014-android.git into sprint2
Merge branch 'sprint2' of https://github.com/Arthur26/hackathon-2014-android.git into 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 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