commit
Merge branch 'master' of https://github.com/aaustin/FriendIQ

Conflicts:
	src/com/friendiq/android/GameView.java