Merge branch 'master' of https://github.com/spion/jsp-api

Conflicts:
	jsp.js