fix issue with default=datetime.now()
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/stickers/views.py
	manage.py