Merge branch 'master' into ads

Conflicts:
	main/server/views_refactored.py
Merge branch 'ads' of github.com:ialbert/biostar-central into ads
Merge branch 'ads' of github.com:ialbert/biostar-central into ads
only ad authors may stop ads