Modified router from server
Merge branch 'master' of github.com:druidinc/framework

Conflicts:
	lib/router/Router.php