New main.xml and Main.java
Added menu.xml
new master
Merge remote-tracking branch 'origin/master'