Merge origin/master

Conflicts:
	src/framedemos/Menus.java
Merge origin/master