This is first commit of sprint 2.it contains add template categoty functionality
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	cmsadmin/src/com/contento3/web/template/TemplateUIManager.java
	core/src/main/java/com/contento3/cms/article/service/impl/ArticleServiceImpl.java
	core/src/main/java/com/contento3/security/user/service/impl/SaltedHibernateUserServiceImpl.java
This is Sprint 2 commit..it contains add template category functionality