Merge branch 'CDL-MVP' into CDL-MVP

switch flash[:notice] to flash[:alert]

ran gettext:find and gettext:po_to_json

removed unecessary user_signed_in? check

Fixed bug with index.js location

made adjustments to success message logic

Merge pull request #499 from DigitalCurationCentre/xsrust/mvp ...

Xsrust/mvp: 
First commit adds aria tags according to #496. Please check that the formatting of these is correct as I am not very familiar with aria.

The second commit is a bit of housekeeping which removes the deprecated 'views/projects' for which we have no controller.

Merge pull request #504 from DigitalCurationCentre/kmcgre/CDL-MVP ...

Adds copy template option #148

Change flash notice to alert for error

Adds copy template option #148

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

fixed tests DMPRoadmap/roadmap#175

updated controllers to use alert instead of notice for errors DMPRoadmap/roadmap#175

updated tests to work with new standardized success messages DMPRoadmap/roadmap#175

fixed issue with Shib logout url

added generic success message and updated controllers to use it DMPRoadmap/roadmap#175

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