set main script
Merge branch 'master' into express-4

Conflicts:
	package.json
upgrade to express 4