+generator
Merge branch 'master' of github.com:jackdevil/videoAd

Conflicts:
	server/main/admin.py
+calendar
+datefield