Lots of crap!
Merge branch 'master' of
https://github.com/HenrikJonsson1986/OuyaGameGDX.git

Conflicts:
	core/src/com/mygdx/ouyagame/OUYAGame.java
	core/src/com/mygdx/ouyagame/UI/InGameGUI.java