update webapp, add android app

incorrectly copied trunk for gcode, which was a portlet app. shouldve
been the servlet branch. fixed this.