fix padding top
Merge branch 'master' into theradiocc
remove asterisks
fix django.wsgi
Merge branch 'master' into theradiocc

Conflicts:
	apache/django.wsgi