8-ra
Merge origin/master

Conflicts:
	src/java/main/Menu.html