restify demo
Merge branches 'master' and 'master' of https://github.com/winnie123/MakeBeatuifulInsideServer

Conflicts:
	demo/restifyDemo/jsonpDemo.js