Merge branch 'development' into CDL-MVP ...

Backporting bugfixes. db:migrate needs to be run to add new indices.

fixed sizing of input fields and added data contact phone to project details

finished up project details page

removed n+1 queries from edit phase and show plans page

fixed bu in plans.controller, added new fields to attr_accessible on plan model, added migration tasks for v0.4 upgrade

fixed merge conflicts

only published guidance groups display for plan details

added check for nil owner

Change default plan visibility to `3` (`:privately_visible`)

added plan visibility to edit/view plan details DMPRoadmap/roadmap#151

fix issue regarding co-owner ablility to delete the plan #242 ...

(cherry picked from commit 6b90953)

resolved merge conflicts from merging development 2016-06-09 into CDL-MVP

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

Plan duplication functionality. ...

Ability to Create a Plan copy

removing guidances being copied over since they requrie omly references

Plan deep copy method to duplicate plans (associated answers and guidance_groups)

Append 'Copy of' to the title of a duplicated plan

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

merged development into annotations

updated references of suggested_answer to annotations

fixed tests

fixed merge conflicts

added new create plan page

fixed merge conflict in schema.rb

updated models to relfect new name for join table between plans and guidance groups. fixes #198

added line to convert User to User.id on plan role assignment functions

Removed exclamation mark from uniq as it modifies the variable directly (instead of copying) and returns nil instead of an empty string if the array is empty

ensure correct guidance groups display for plan editing

fixes guidance group selection for plans

assign permissions on create plan. Fixes: #220

remove some old code

Add messages to create plan explaining decisions. Fixes https://github.com/DMPRoadmap/roadmap/issues/207

fix merge conflicts