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

Conflicts:
	Wmframework/App/Config/config.php
	Wmframework/App/Config/filters.php
	Wmframework/Lib/Controller/FrontController.php