Minor fixes etc
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/src/com/contento3/web/CMSMainWindow.java
	core/src/main/java/com/contento3/cms/page/category/service/impl/CategoryServiceImpl.java
	sites/src/com/contento3/filter/DefaultPageFilter.java
	sites/src/com/contento3/site/filter/SiteInterceptor.java
	sites/src/com/contento3/site/resolver/StaticResourceViewResolver.java