Merge pull request #11 from kitemao/master

update gruntfile
Add socket.io.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/business/AppLoader.js
	app/business/RequireConfig.js
Merge pull request #12 from ivanzhaowy/master

Merge