bvbcchc
Merge remote-tracking branch 'origin/master'

Conflicts:
	kemika-root/kemika-web/src/main/webapp/WEB-INF/view/splash.jsp