lalala
Merge remote-tracking branch 'origin/master'

Conflicts:
	publish/views.py
	templates/advertisement.html
merge advertisement