Back.  Distracted by customers.
Merge branch 'master' of https://github.com/addinall/HTML5-Toolset

Conflicts:
	oop/database.php