Merge branch 'issue622' into 1.6.x
 - changed version of jetty-maven-plugin as 8.0.0.M1 seems to be a dud with maven 3.
 - see http://stackoverflow.com/questions/4154238/jetty-maven-plugin-does-not-work-with-maven-3 for details
Merge pull request #84 from svanders/demo-fix

Fix demo with maven 3
Preprocessor for emberjs templates
update handlebars to 1.0.rc.1 and use existing handlebars library in ember.js
ignore inconsistently failing unit test
update javadoc
Merge branch 'issue686' into 2.0.x
fix merge issues