changed sql, moved css folder
Merge branch 'master' of
https://github.com/oduvan4ic/company-management-system.git

Conflicts:
	company-management-system/cms-web/src/main/webapp/WEB-INF/views/home.jsp
Merge branch 'master' of https://github.com/oduvan4ic/company-management-system.git
Merge branch 'master' of https://github.com/oduvan4ic/company-management-system.git
@Transactiona -> contactType
Merge branch 'master' of https://github.com/oduvan4ic/company-management-system.git
Added email,phone,officePhone fields to Contact.class
+ jquery