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

Conflicts:
	Wmframework/Lib/Model/Mapper.php