Merge branch 'master' of https://github.com/rwojcik/grapwr

Conflicts:
	GraPWr/src/pl/grapwr/activity/GameActivity.java
Merge branch 'master' of https://github.com/rwojcik/grapwr