Merge pull request #11 from garcha/development

push to master
add privacy and terms
add link
text size change
change h1 to h2
device route change, view options change
add admin views
fix merge conflicts
Merge pull request #12 from garcha/admin_views

Admin views