add trunk
asset data test
fix mearge Merge branch 'auto_dev' of https://github.com/triaquae/tri_client

Conflicts:
	core/RSA_key.pyc
	core/db_connector.pyc
	core/global_setting.pyc
	core/key_gen.pyc
	core/random_pass.py
	core/random_pass.pyc
	core/redis_connector.pyc
	core/tri_server.py
	testPro/app01/__init__.pyc
	testPro/app01/admin.pyc
	testPro/app01/models.pyc
	testPro/testPro/__init__.pyc
	testPro/testPro/settings.pyc
	testPro/testPro/urls.pyc
	testPro/testPro/wsgi.pyc
	testPro/triWeb/__init__.pyc
	testPro/triWeb/admin.pyc
	testPro/triWeb/admin_auth.pyc
	testPro/triWeb/admin_ip.pyc
	testPro/triWeb/admin_user.pyc
	testPro/triWeb/models.pyc
	testPro/triWeb/redis_connector.pyc
	testPro/triWeb/views.pyc
fix win bugs
update configuration interaction feature between server and clients