merge front end changes from aptana (html5) into java mvn project