Second rough draft
Merge branch 'dev2'
V1 template based off demo.html done. Wrapper created for this to handle noncontent. Converted existing views.