GENERAL - moved sample app to performance test directory and renamed it to test-server-jetty
Merge branch 'master' into 0.4.0-dev

Conflicts:
	performance-test/pom.xml
	performance-test/test-server-jetty/src/main/webapp/js/bristleback-0.3.5.js
	sample-app/pom.xml
	sample-app/src/main/java/sample/action/HelloWorldAction.java
	sample-app/src/main/java/sample/client/js/bristleback-0.3.5.js
	sample-app/src/main/java/sample/client/js/bristleback-0.4.0.js