Fixed Wallet Controller example in controller.html doc
Merge branch 'master' of git://github.com/saoili/mamba-framework into saoli-master

Conflicts:
	docs/development/controller.rst
Merge branch 'saoli-master'