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

Conflicts:
	Wmframework/App/Controller/IndexController.php
	Wmframework/Lib/config.php
	Wmframework/Lib/error.php
	Wmframework/Lib/helpers.php
	index.php