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

Conflicts:
	Wmframework/App/Controller/IndexController.php
	Wmframework/Lib/Controller/PageController.php
	Wmframework/Lib/View/View.php