All dis shit
Merge branch 'master' of github.com:SpaceTeam/MicroSpace

Conflicts:
	MicroSpace-html/.gwt/.gwt-log