Small Fixes
Merge branch 'master' of https://github.com/Craftware/Kornell

Conflicts:
	kornell-api/src/main/scala/kornell/server/util/EmailSender.scala