Add maven-resources-pkugin for testing
Merge branch 'develop'