#271 Restored Java 6 compatibility.
Added configuration for demo and e2e tests
Reverted configuration for demo to master compatible configuration, to be able to merge it into hotfix and master branches.
Merge branch 'master' of https://github.com/scenarioo/scenarioo
#220 fixed jshint errors
Merge branch 'hotfix/1.0.3'
Merge tag '1.0.3' into develop

1.0.3

Conflicts:
	scenarioo-server/src/main/java/org/scenarioo/rest/UseCasesResource.java
	scenarioo-server/src/main/resources/config-for-demo/config.xml