add setting
add coinMaster
Merge branch 'master' of https://github.com/zin2000/web.git

Conflicts:
	.classpath
	.project