made some updates
Merge branch 'master' of github.com:dragondagda/withoutplan

Conflicts:
	src/de/ggj14bremen/withoutplan/model/Cell.java