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

Conflicts:
	kornell-gwt/src/main/webapp/Kornell.jsp
Pre-loading iframes