fixed some bug
fixed some bug
Merge branch 'master' of https://github.com/pandamicro/cocos-template

Conflicts:
	xyt/index.html
Merge pull request #8 from wuzhiming/master

fixed some bug