Update changelog.md
add version to maven-resource-plugin
Merge branch 'master' of github.com:ConSol/sakuli
Update changelog.md
Update changelog.md
add unit-tests for RhinoAspects
Merge branch 'master' of github.com:ConSol/sakuli
Merge branch 'master' into SAKULI-38_gearman

Conflicts:
	core/src/main/java/de/consol/sakuli/datamodel/TestCase.java
fix unit test testdoScreenBasedActionLog
Merge branch 'master' into SAKULI-38_gearman