updated to use latest jsmockito package with fix and removed workaround
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/fix_jsmockito_npm.js