rethinking
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/MainModule/src/main/scala/dummy/sandbox/mainmodule/MainModule.scala
Merge pull request #1 from kantefier/homebranch

Homebranch