menu now appears above tooltip
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/main.js
Merge pull request #44 from jpecht/master

menu now appears above tooltip