nothing still works :(
Merge branch 'new-trails' of github.com:KaeruCT/glxy-android into new-trails

Conflicts:
	glxy/src/com/kaeruct/glxy/actor/Universe.java