Database stuff, too many php files.
Merge branch 'master' of github.com:ioCx/Chronos

Conflicts:
	database.php