Merge remote-tracking branch 'origin/master'

Conflicts:
	mnstr/views.py
	monsternews/urls.py