options and menu updates
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	src/gamejam10/options/Options.java
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git into develop