gpages displayed in left col according to context
Merge branch 'master' of https://github.com/tazogil/sabtv

Conflicts:
	gpages/templates/admin/gpages_tag.html
	settings.py