Removed custom db/cache names.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.php