Rema, rema, rema
Merge branch 'master' of https://github.com/Craftware/Kornell

Conflicts:
	kornell-api/src/main/scala/kornell/server/api/UserResource.scala
	kornell-api/src/main/scala/kornell/server/repository/jdbc/Enrollments.scala