updated policy name #242

updated policy code to work(replaced where with find_by)

added ability for users to remove themselves from plans, without destroying the plan

made suggested changes from PR

finished plan share and edit pages. Updated styling and handling or alert/notice messages. Updated css to allow background color, alert message and notice message colors to be set in dmproadmap.scss

Merge pull request #499 from DigitalCurationCentre/xsrust/mvp ...

Xsrust/mvp: 
First commit adds aria tags according to #496. Please check that the formatting of these is correct as I am not very familiar with aria.

The second commit is a bit of housekeeping which removes the deprecated 'views/projects' for which we have no controller.

Adds copy template option #148

removed depricated projects files

fixed merge conflicts

fixed merge conflicts

fixed merge conflict left over from unstashed changes

Merge branch 'CDL-MVP' into branding

completed work on API

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

updated org-admin customization of templates according to #373

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

Merge remote-tracking branch 'upstream/development' into annotations

merged development into annotations

updated org-admin interface to use annotations for template editing

updated references of suggested_answer to annotations

renamed suggested_answer files to annotations

Started adding in ajax call to retrieve list of templates

Updated template controller to use new model helper methods. updates phase/section/question controllers to update template dirty flag. added new routes for customize, publish, unpublish

updates to locking mechanism because it ActiveRecord does not catch 2 creates DMPRoadmap/roadmap#241

realized answer policy was never firing. updated create? to update? and fixed typo DMPRoadmap/roadmap#241

updated create template policy so that the auth passes if no template.org is specified. the controller attaches the user's org afterward DMPRoadmap/roadmap#191

Updated test so that it does not provide a version or org so that we match what the form is doing DMPRoadmap/roadmap#191

finished functional tests DMPRoadmap/roadmap/#212

Uncommented the show_export method DMPRoadmap/roadmap#227

fixed issues in plan policy and commented out unused routes