desktop commit
saa
desktop
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidGameTut/src/com/avillardo/framework/Game.java
desktop