website
Merge remote-tracking branch 'origin/master'

Conflicts:
	AdBeacon/urls.py
	publish/views.py
	templates/home.html
website advertisement page