encoding
Merge remote-tracking branch 'origin/dev'

Conflicts:
	base/model.py
	base/util.py