Tooltips added & sizing of boxes changed
Merge branch 'master' of https://github.com/saylorp/CollabDesk

Conflicts:
	tooltip.js