removed conflict code
Merge branch 'live' of razorit.beanstalkapp.com:/zuha into live
submod update
submod sites
submods
You can now install templates in the templates table with a single click.

Previous to this installing a template was a process of taking multiple steps.
Added a field to the templates table, and did a check on template installation to see if it's a reinstall.

We require that templates have a unique name, and that each element, or css file, or js file have a unique name.  Preferrably the sub-items would just be prefixed by the template name.  Eg. sidebar-custom.css, sidebar-left-sidebar.ctp, sidebar-left-footer.ctp, etc.
submods
submod conflict
submod update
Added user_role_id field to webpage_menus table

We are making it so that each user role can have an individual menu, and now that field can be set, and the element function in the WebpageMenusController checks a few cases of when we might need the user_role_id field.
Merge branch 'stage' of razorit.beanstalkapp.com:/zuha into stage
Extensively tested install

After all of the changes made with the build portion of the install, had to go through and make sure that installation still worked.  It did NOT.  There is one change in here, that may cause problems, but not sure.  It was commented in the OptimizableBehavior, so if alias saving experiences an issue that is where to look.
Fixed some stuff with adding menu items from the install.
Add ability to limit how many checkboxes may be checked

This checks for an attribute called 'limit'.  If a user checks more boxes than the limit, an alert will popup,
telling them of the limit.  Then, the most recently checked box will be unchecked.

This code should work fine for any checkboxes that are created using: `$this->Html->select()`
submod updates
Merge branch 'stage' of razorit.beanstalkapp.com:/zuha into stage
added thumbnail relationship
Merge branch 'stage' of razorit.beanstalkapp.com:/zuha into stage
Working on Site Buildrr Mostly, added multiple menu building updates. Including that you can now edit multiple menus at once.