?
Merge branch 'master' of https://github.com/wallacemaxters/wm

Conflicts:
	Wmframework/App/Config/Route/route.php
	Wmframework/App/Config/app.php
	Wmframework/Lib/Routing/Route.php
	Wmframework/Lib/Routing/Uri.php