Merge pull request #9 from thomasE1993/master

dsa
Merge pull request #3 from sandro-pedrett/sprint3

Sprint2.1
Merge pull request #4 from sandro-pedrett/sprint3

Sprint3
Merge pull request #5 from itcc-li/sprint2

Sprint2
- eventlistener für gps
- gpslistener interface
Merge pull request #33 from Arthur26/sprint2

Sprint2
add text and pic
progressdialog für warten
Merge pull request #6 from itcc-li/sprint2

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

Sprint2
Merge remote-tracking branch 'origin/sprint2.1' into dev
Merge branch 'dev' into sprint2.1

Conflicts:
	Hackathon[2014]/res/values/strings.xml
	Hackathon[2014]/src/li/itcc/hackathon2014/vaduztour/SculptureFragment.java
Merge pull request #34 from dariogartmann/sprint2.1

Sprint2.1
Merge pull request #17 from itcc-li/sprint2

Sprint2
selfie bpm
Merge pull request #35 from plon33r/tmp

Tmp
Merge pull request #13 from itcc-li/sprint2

Sprint2