Merge branch 'hotfix/1.0.0-run-with-java-8'
#264 Changed the example to use the new savePngScreenshot method.
Merge remote-tracking branch 'origin/develop' into develop
#269 New config option to expand pages in scenario overview by default.
Merge branch 'hotfix/269-config-option-expand-pages' into develop

Conflicts:
	scenarioo-server/src/main/java/org/scenarioo/model/configuration/Configuration.java
Restored Java 6 compatibility
Merge branch 'develop' into 64-browsing-app-specific-objects

Conflicts:
	scenarioo-client/app/scripts/controllers/scenario.js
	scenarioo-client/app/styles/scenarioo.less
	scenarioo-server/src/main/java/org/scenarioo/model/configuration/Configuration.java