wip
Merge branch 'master' into foo

Conflicts:
	app/src/org/govhack/vespene/atlas/Atlas.java