Merge pull request #2481 from colemanw/options

CRM/Activity/Form/Activity.php

CRM/Admin/Form/Options.php

CRM/Admin/Page/Options.php

CRM/Contact/Form/Edit/Phone.php

CRM/Core/DAO.php

CRM/Core/Form.php

CRM/Core/PseudoConstant.php

CRM/Mailing/Form/Upload.php

CRM/Utils/Api.php

css/civicrm.css

js/Common.js

templates/CRM/ACL/Page/ACL.tpl

templates/CRM/ACL/Page/EntityRole.tpl

templates/CRM/Admin/Page/Access.tpl

templates/CRM/Case/Page/Tab.tpl

templates/CRM/Contact/Form/Task/Email.hlp

templates/CRM/Financial/Page/FinancialAccount.tpl

templates/CRM/Mailing/Form/Upload.hlp

xml/templates/civicrm_navigation.tpl