removed stub mainmenu.java
Merge origin/master