fixed broken test for resizing org logos

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

fixed broken test created by change in dashboard page title. updated logo resize function on org model to work with 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'

Merge pull request #502 from DigitalCurationCentre/issue483 ...

DMPRoadmap/roadmap#483

-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 'role=button' to popover links DMPRoadmap/roadmap#138

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

Merge pull request #488 from CDLUC3/CDL-MVP ...

Fixes based on PR feedback

fixed typo

added question_options to answer's deep copy method and added a unit test for it. Updated several views to use .length instead of .count

reverted permission changes so that a user cannot grant permissions that they themselves do not have

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

Merge pull request #487 from CDLUC3/CDL-MVP ...

Added checkbox for test plan to create plan page.

removed create test plan link from view plans page DMPRoadmap/roadmap#408

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

Merge pull request #486 from CDLUC3/CDL-MVP ...

Minor CSS tweaks

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

two minor CSS changes. one to set input height due to IE display issues. The other to remove colon after checkbox labels

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