Major Commit
Merge branch 'master' of https://github.com/teamfyh/mvc

Conflicts:
	core/router.php