Temp commit prior to pull
Merge branch 'master' of https://github.com/inpaner/swiftea-libgdx.git

Conflicts:
	swiftea-desktop/bin/.gitignore
	swiftea/bin/.gitignore