bundle update
upgrade jasmine
Merge branch 'jasmine2'