revert dev edits (make-package and gwt cmakelists)