Airplane Day
Merge branch 'master' of github.com:Craftware/Kornell

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

Airplane day