Merge new layout into master

# It's time to merge the new layout into the master branch.  

Elements that are in the branch but are not currently used in the layout are listed below:

* Sidebar functionality and partials for each of the main areas
* Drag &amp; Drop functionality for image uploads.