Updating gemfile to Rails 4.0.5.
Merge branch 'development' into scott_dev
Changes to user menu system to make it more maintainable and work with rails 4.0.5.
work in progress for redoing menus for 4.0.5
redoing menus for 4.0.5 -- needs testing to be sure it's working.
Merge branch 'development' into scott_dev
Another problem in a sub-menu.
Merge branch 'scott_dev' into development -- this adds fixed menu structure and also upgrade to rails 4.0.5 for security issues.

Conflicts:
	Gemfile.lock
Fixing plan states to show different statuses than we have in the database 'cause we like it confusing like that.
Changed logic of determining the correct review type from customization by searching for the specific customization, not the customization that adds an individual resource.
Remove new DMP template button for users that don't have permissions.
Adding scope to allow choosing any items from root institution or children for choosing templates to create dmp from.
edit resource - add tooltip and current template highlight with the word (current)