Using Text instead of UnicodeText. Removing time from base.yaml
Merge remote-tracking branch 'origin/master'

Conflicts:
	base.yaml
	booking/models.py