Merge branch 'master' of https://github.com/raxrax/fw

Conflicts:
	core/core.php