cosmetic
got the user admin functions to work
added AdminHome link
improved editability of users
Merge branch 'master' into CMS1

Conflicts:
	src/main/java/com/incra/controllers/AdminHomeController.java
	src/main/webapp/WEB-INF/tiles.xml
	src/main/webapp/WEB-INF/views/header.jsp
	src/main/webapp/WEB-INF/views/user/create.jsp
improved editability of users
Merge branch 'master' into CMS1
improved editability of users
Merge branch 'master' into CMS1
improved editability of users
Merge branch 'master' into CMS1
improved navigation