upgrade to jasmine v1.3.1
update file paths
Merge remote-tracking branch 'origin/master' into randy/jasmine-1.3
Merge pull request #7939 from adobe/randy/jasmine-1.3

Upgrade Jasmine to v1.3.1
more fixes
Merge pull request #8014 from adobe/randy/jsdocs

More JSDoc fixes
no 's' on the end of @return
Merge pull request #8015 from adobe/randy/jsdocs

No 's' on the end of @return