resolved merge conflicts

fixed merge conflicts

updated admin_phase view and partials associated with it to use new data access

removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

Switched answer text area to substance editor.

Added substance-rails gem and then included the appropriate js and css libraries into the asset pipeline

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

added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file

bugs found in fr dmponline

editing a guidance by question now shows template through question

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

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