changed port of testing server
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	test/browser/data/public/application.js
bump