Added featuretest
Merge branch 'testfeature' into develop
Merge branch 'release-1'