Preparing for CDI and Clicky
Merge branch 'master' of https://github.com/Craftware/Kornell

Conflicts:
	kornell-gwt/src/main/webapp/Kornell.nocache.html