Fixes #6537: Entering a very large number for idle_timeout is unchecked, crashes UI
Fixes #6580 - XSS in operating system name/description (CVE-2014-3531)
fixes #6586 - allow user customizable password in rake permissions:reset
fixes #3664 - support deletion of installation media that's in use
Fixes #6057: highlight active tab based on current URL.

Highlight the active menu tab based on the current URL
rather than relying on the controller and action.  This
fixes a problem where top level menus that contain plugin
menu items were not being highlighted when active.

http://projects.theforeman.org/issues/6057
fixes #6487 - use consistent icon set
Fixes #6582: Change position of buttons when editing a location
Merge remote branch 'origin/develop' into develop