Initial map loading
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	core/src/com/mandatoryfun/LDGame.java