Guidances new/edit with table formatting displayed properly. DMPRoadmap/roadmap#272

Merge branch 'master' into add-orcid-functionality

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