sync
Merge branch 'master' of https://github.com/cagegong/erplite

Conflicts:
	Server/Contacts/views.py
	Server/Server/urls.py