Conflicts:
	src/app/controllers/roles_controller.rb
Menu - Fixes issue where menu updates did not correctly update API
controller.
Merge pull request #1614 from ehelms/menu-updates

Menu Updates