replaced "/opt/ruby/bin/ruby" with "ruby" (as it is in the PATH and the
location seems to have changed in recent provisioning environment
update)
Merge branch 'v3'
Merge branch 'master' of https://github.com/zeroturnaround/lr-demo-answers-java

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