Merge pull request #1 from itcc-li/sprint1

Sprint1
Merge pull request #1 from itcc-li/sprint1

Sprint1
Sources for story 2
GPS base fragment.
Merge pull request #2 from itcc-li/sprint2

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

Sprint2
GPS fragment extends AbstractTourFragment.
Merge pull request #14 from Arthur26/sprint2

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

Sprint3
commit
Merge pull request #3 from itcc-li/sprint2

Sprint2
Merged
Merge branch 'sprint3' into sprint2

Conflicts:
	Hackathon[2014]/AndroidManifest.xml
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
	Hackathon[2014]/src/li/itcc/hackathon2014/NavigationDrawerFragment.java
merge
commit sprint3
commit
Merge branch 'sprint3' into sprint2

Conflicts:
	Hackathon[2014]/gen/.gitignore
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
Merge pull request #16 from stevebo/sprint2

Sprint2
Merge pull request #5 from schlafenderbiber/sprint2

Sprint2
Merge branch 'tmp' into sprint2