merging
Merge branch 'master' of https://github.com/Craftware/Kornell.git

Conflicts:
	kornell-api/src/main/scala/kornell/server/api/CourseClassesResource.scala
	kornell-api/src/main/scala/kornell/server/repository/jdbc/CourseClasses.scala
	kornell-api/src/main/scala/kornell/server/repository/jdbc/PreparedStmt.scala
	kornell-gwt/src/main/java/kornell/gui/client/GenericClientFactoryImpl.java