Merge pull request #17 from adaptorel/sbt-restructure

Sbt restructure
Merge branch 'master' into multitenancy