update by Yeqin_Zheng 07.17
Merge branch 'master' of github.com:Entel/CommunityPython into Entel-master

Conflicts:
	code/handler/AddrelativesHandler.py
	db.sql

merge
Merge branch 'Entel-master'