Merge branch 'v3' of https://github.com/zeroturnaround/lr-demo-answers-java into v3

Conflicts:
	webapp/src/main/webapp/WEB-INF/liverebel/scripts/appUp/always/run_tests.sh
Merge branch 'v3'