require

实现requirejs加载
some update

远程 socket 刷新还是有问题
Merge branch 'master' of https://github.com/somax/dev4DXGJ

Conflicts:
	.idea/workspace.xml
	app/index.html
	app/js/app.js
	app/js/controllers.js
	app/partials/partial1.html