Little bug on uninstallOptions().
Merge pull request #230 from Daniel-KM/bug_uninstallOptions

Fix a little bug on Omeka_Plugin_Abstract::uninstallOptions().
Pull from Transifex.
Prevent CSRF on users add/edit/change-password [backport from Omeka 2.2].

Conflicts:
	application/forms/User.php
Fix tests for new CSRF protections [backport from Omeka 2.2].

Conflicts:
	application/tests/integration/Controllers/UsersControllerTest.php
Bump version to 1.5.4.