Import source code
Merge commit '605128df902599a56b9ca37068191f18ee9d3f67'

Conflicts:
	README.md
	package.json
	server.js
resolve conflicts