Merge branch 'CDL-MVP' of https://github.com/DMPRoadmap/roadmap into xsrust/498

updated view for show_export and controller according to #498

made suggested changes from PR

Merge branch 'plan-details-share' into CDL-MVP

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

popover and tooltip triggered by focus and hover. DMPRoadmap/roadmap#141

finished up share plan page.

started work on share plan page DMPRoadmap/roadmap#497

finished up project details page

fixed merge conflict and set max width to h1 tags to prevent overlap with alert/notice messages

started refactoring the edit project details page DMPRoadmap/roadmap#491

ran gettext:find and gettext:po_to_json

standardized placement of error and notification messages DMPRoadmap/roadmap#175

updated label.required to display an asterisk before the label. updated contact_us page to use the required class

Merge pull request #59 from DMPRoadmap/CDL-MVP ...

Rebase with contact_us fix

Fixed layout issues on org details page

fixed issue with language dropdown color DMPRoadmap/roadmap#161

moved institution logo so that it replaces roadmap logo and updated dragonfly resize method so that it uses the larger image size DMPRoadmap/roadmap#242

Updated header to use white background by default and updated to use the institution logo when the user is logged in if present DMPRoadmap/roadmap#424

Updated global navigation per DMPRoadmap/roadmap#161. Also updated plan edit phase label to 'Write Plan' if there is only one phase, and switched 'View Plans' to 'My Dashboard'

-Replaced wrong parameter names since it is expected contact_us_contact[...] ...

-Fixed logic for when an email is valid and re-introduced the previous regex, which is compatible with contact_us gem
-Replaced disabled fields (e.g. email, name) with readonly attribute, otherwise these parameters are not send to the server

DMPRoadmap/roadmap#483

started implementing new nav bar DMProadmap/roadmap#161

added aria tags to all fontawesome icons DMPRoadmap/roadmap#139

Updated forms.scss so that multi-select boxes display multiple rows

updated create plan to show autocomplete errors on blur DMPRoadmap/roadmap#408

updated default -color based on DMPRoadmap/roadmap#127 began making mods to create plan based on feedback for DMPRoadmap/raodmap#408

began adding aria tags to fontawesome icons. added alt tags to images. renamed two partials that do not seem to be used DMPRoadmap/roadmap#139

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

added 'mock project' checkbox to create plan page. css restyling of create plan page DMPRoadmap/roadmap#408

Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP