Game Display on external screen
Merge branch 'master' of https://github.com/Cassio90/slayerman

Conflicts:
	src/de/uulm/Slayerman/GameActivity.java
Merge branch 'master' of https://github.com/Cassio90/slayerman

Conflicts:
	src/de/uulm/Slayerman/Item.java