add manifest
Merge branch 'master' of github.com:loviselu/web-excel

Conflicts:
	app.js
抽取css
merge
Merge branch 'master' of github.com:loviselu/web-excel

Conflicts:
	app.js
	controllers/file.js
	controllers/index.js
	controllers/user.js
	dataProducer.js
	excel-editor/index.html
Merge branch 'master' of github.com:loviselu/web-excel

Conflicts:
	app.js
	controllers/file.js
	controllers/index.js
	controllers/user.js
	dataProducer.js
	excel-editor/index.html