peerdependencies socket.io updated to 1.0.1 in package.json
bumped version to 0.3.16
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
	tests/ng.html
	tests/package.json