first addition of CMS data structures
Merge branch 'master' into CMS1
Merge branch 'master' into CMS1
began to build out site management
filled out editing for site, rubric
improved the editing and creation of rubrics and sites
got the user admin functions to work
began to build out operations on Boxes, added property editors
first version which renders custom page
added rowIndex and colIndex columns to Box
added controller for editing boxes
added more editing support
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
Merge branch 'master' into CMS1
Merge branch 'master' into CMS1
Merge branch 'master' into CMS1
improved navigation
Merge branch 'master' into CMS1
first tests with CKeditor
first tests with CKeditor