adding local server
Merge branch 'master' into build-WIP

Conflicts:
	package.json