init repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	uerp_project/pemail/models.py
	uerp_project/task/models.py
	uerp_project/templates/task/task_detail.html
	uerp_project/uerp_project/settings/base.py
merge result