add all 20130625
upMerge branch 'master' of https://github.com/xulingyun/itvgame-platform

Conflicts:
	.gitignore
updte