fixed merge conflicts

added gemfile and broken branding file

replaces Organisation. with Org. in all files

text changes requested by Sarah 2016/11/14

removed ability to customize view branding folder name. It will just be called branded now

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

fixed issue with branding variable resolution on plan modal dialogs

Created DMPRoadmap logo and swapped out JISC logo for UC3 logo.

finished initial branding of static pages

Began removing branding variables from the locales file and placed them in branding.yml

updated en-UK and en-US locale files to make sure that they use their respective locale ids instead of en. Added a branding yaml file for org and app names