replaced activator with sbt-wrapper
Merge branch 'master'