hopefully the final fix on router bug
Merge branch 'master' of https://github.com/templar92/Agilis

Conflicts:
	framework/route_resources.php