Merge remote-tracking branch 'origin/master'

Conflicts:
	node_module/penet/lib/core.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/penet/lib/core.js
	node_modules/penet/lib/penet.js
	static/index.html
Merge remote-tracking branch 'origin/master'
have some change