test
test
Merge branch 'master' of github.com:stri/iproject

Conflicts:
	config/setting.json
	test.js
update