Role Management preperation
Merge branch 'master' of https://github.com/sheitmeier/catCommerce

Conflicts:
	catweb/src/main/java/com/catcommerce/catweb/AdminController.java
	catweb/src/main/webapp/WEB-INF/views/admin.jsp