two db

Conflicts:

	config.py
	startApp.sh
redis connect to localhost
chinese
fix version =
syn mainServer code to aliyun
remove extra update