Tooltips
Merge branch 'master' of github.com:bengui/giombu

Conflicts:
	views/includes/includes_intranet/menu.jade