Error pages and meta tags
Merge branch 'master' of https://github.com/IrisNerve/iris

Conflicts:
	iris_app/views/page_views.py