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

Conflicts:
	Wmframework/App/Controller/AbstractController.php
	index.php