Resolve merge conflicts. DMPRoadmap/roadmap#587

updated comments in production.rb to include an action_mailer default_url_options

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

added initializers that were previsouly ignored by gitignore