does not build!
Merge branch 'master' of https://github.com/turpgames/doubleup

Conflicts:
	doubleup-android/assets/game.xml
	doubleup/src/com/turpgames/doubleup/utils/R.java