Fixed MySQL
Merge branch 'master' of https://github.com/chakeda/cfeed

Conflicts:
	database.php