kill previous server.
Merge remote branch 'origin/master' into development
clean up.
Merge branch 'development' into develop
Merge branch 'develop'

Conflicts:
	Node/fumi-server/README