New Boxes for new Layout
About to pull upstream
Just pulled from master and fixed merge issues
Commit in case i choose to work from home
fixed routes for CSV upload and manual entry
Finished new user page
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_New_Boxes
Merge pull request #436 from nickavv/parachute

fixed routes for CSV upload and manual entry
Merge pull request #437 from hmcq6/HM_New_Boxes

Hm new boxes
Yay we finally have a .invalid class
Removed ?pid=46 at the end of manual entry url
Merge pull request #438 from hmcq6/HM_Invalid_CSS

Yay we finally have a .invalid class
Merge pull request #439 from hmcq6/HM_Pid

Removed ?pid=46 at the end of manual entry url
Apparently the tutorial page was the only page to use _content which happend to be broken
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_Redactor_Tutorial
Merge pull request #445 from hmcq6/HM_Redactor_Tutorial

Hm redactor tutorial
-In the processing of adding a truncate option to all edit_info and edit_menus
Merge branch 'master' of github.com:isenseDev/rSENSE into mm435
Incomplete pages are still pages
Merge pull request #447 from hmcq6/HM_Fix_Pagination

Incomplete pages are still pages