Add compile-no-gwt
Merge Makefile