Adding qtip2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/src/main/javascript/edu/dfci/cccb/mev/web/javascript/main.js
Merge pull request #745 from lev-kuznetsov/master

Added qtip2