Turn on bootstrap tooltip
Merge pull request #28

Merge branch 'mertonium-tipsy'

Conflicts:
	www/default.js