1st sprint's second commit
Merge branch 'develop' of https://github.com/contento3/Projects into develop

Conflicts:
	core/src/main/java/com/contento3/cms/site/structure/service/impl/SiteServiceImpl.java
Merge branch 'develop' of https://github.com/contento3/Projects into develop
Sprint 2 - commit 1
includes
-DB scripts for Modules, AccountModule, Account
-Tab Icon css issue fix
-Navigation Improvements(in process)