clean up commented out code
access control on deleting and add/remove measures
Merge branch 'activerecord' of github.com:kristenhazard/epm-catalog into activerecord