framgents
Merge branch 'master' of https://github.com/dragondagda/withoutplan.git

Conflicts:
	src/de/ggj14bremen/withoutplan/MainActivity.java
Merge branch 'master' of https://github.com/dragondagda/withoutplan.git

Conflicts:
	src/de/ggj14bremen/withoutplan/MainActivity.java