Merge pull request #1 from itcc-li/sprint1

Sprint1
sprint2
testcommit
Merge pull request #2 from itcc-li/sprint2

Get abstract class
API defined
Merge pull request #3 from simonmeier/sprint2

Sprint2
Add gps deliverer
Merge pull request #5 from itcc-li/sprint2

Sprint3
commit
Merge branch 'sprint2' into sprint3

Conflicts:
	Hackathon[2014]/AndroidManifest.xml
	Hackathon[2014]/src/li/itcc/hackathon2014/MainActivity.java
Merge pull request #14 from Arthur26/sprint2

Sprint2