Fix unique intent id bug
Merge branch 'master' of github.com:shi-314/AngryKings

Conflicts:
	src/com/angrykings/activities/GameActivity.java