Add option to change lens units to ft/in or mm/cm. Try 2

Created originally on Bitbucket by mk11174 (Mathew Kelly)

Was already merged in Bitbucket before import, marked as merged by the import user

Source changeset not longer availableat the time of import. Commit listwill look empty