updating
Merge branch 'master' of https://github.com/jed15/socialwiki

Conflicts:
	pagelib.php
updating
Added tooltips to navigation buttons
Merge branch 'master' of https://github.com/jed15/socialwiki

Conflicts:
	renderer.php
Added tooltips and seperated socialwiki theme