Content Type changes; Add Content links to top

Changes to Content type as discussed on 5-8-2014;
Moved Add Content to top block to stretch out grids.
Added file upload on Match pages