Merge branch 'dev' of https://github.com/bcosca/fatfree into dev

Conflicts:
	lib/base.php