added proxy server
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/grid/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/grid/index.js