Merge pull request #3 from itcc-li/sprint2

Sprint2
add intro
added locationmanager and sculpturefragment
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 pull request #20 from sandro-pedrett/sprint3

Sprint3