* 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen:

# Conflicts:
#	doc/DB/compass_db_schema.xlsx