Boh changes
Merge branch 'test'

Conflicts:
	src/main/MainMenu.java
Merge branch 'master' of
https://github.com/VSGP2014/viope_space_game.git

Conflicts:
	src/main/Editor.java