Merge branch 'make_view_edit_view_into_tab' of github.com:aptivate/internewshid into make_view_edit_view_into_tab

Conflicts:
	django/website/hid/views.py