Merge branch 'develop' into api1.2
1) added the scalaTest-maven plugin
2) added tags to the test scenarios
Merge branch 'api1.2' into develop
merge conflict