asdf
Merge commit '76c347e6348c6e1362d414c0274c8620be742441' into inaki-merge1

Conflicts:
	test/core/src/com/test/systems/AssetsSystem.java
	test/core/src/com/test/systems/ScreenSystem.java
Merge branch 'master' into inaki-merge1

Conflicts:
	test/core/src/com/test/systems/AssetsSystem.java
- UISKIN
assets siskin
Splash splashes, mock main menu.
menuscreen button fixes
Merge remote-tracking branch 'origin/master' into splash-tests

Conflicts:
	test/core/src/com/test/systems/ScreenSystem.java
Menu commented and old one removed
Merge branch 'splash-tests'
.gitIgnore
Merge remote-tracking branch 'origin/master' into gamemap-zoom-pan

Conflicts:
	.gitignore
	test/core/src/com/test/systems/AssetsSystem.java
	test/core/src/com/test/systems/ScreenSystem.java