Device ID added
Merge remote-tracking branch 'origin/development'

Conflicts:
	src/com/spaceshooter/game/view/GameView.java