added answer-notice class that will make the lock version text area wider DMPRoadmap/roadmap#241

choose template where org has more than one valid

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

extracted plan visibility work out of dev branch for PR to DCC

Switched answer text area to substance editor.

switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

Merge branch 'master' into add-orcid-functionality

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views