fixed bug on contact_us page ...

(cherry picked from commit e041a9d)

updated contact-us to work with new form css and js ...

(cherry picked from commit fd16459)

cleanup of tabs and objects that are no longer in use DMPRoadmap/roadmap#305 ...

(cherry picked from commit 754a4e0)

resolved cherry-pick conflicts

started register form rewrite DMPRoadmap/roadmap#305 ...

(cherry picked from commit 4ff7313)

fixed tests to deal with placement of welcome header on home page DMPRoadmap/roadmap#305 ...

(cherry picked from commit 0d56b3d)

resolved cherry-pick conflicts

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

(cherry picked from commit 6b90953)

resolved cherry-pick conflicts

resolved cherry-pick conflicts

fixed typo introduced during merge conflict resolution

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

changed empty string to nothing

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

updated edit customization and published status of customizations according to #338

fixed bug where org not set by update function

updated class for button, fixes issue brought up in #373

enforce manditory fields on edit profile page

Filtering funders with published templates only - Closes #387

Fixed faulty description display logic for plans with 1-phase-templates - Closes #401

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

Changed error text - closes #382.

added default answer text according to #388, fixed bug introduced yesterday from guidance fix

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

updated org-admin customization of templates according to #373

Default ordering for Phase, Question becomes .number - closes #402

Changed guidance tooltip - Closes #333

Made invitation email title same as sharing email title - related to #271

remove add phase button from customized templated