Edited Comments
Merge branch 'master' into db

Bringing db branch up to date.
Merged Master
Merge branch 'master' into db

Conflicts:
	resources/php/Database.php
Added array_to_html method to Chameleon Class