shizzle
Merge branch 'master' of github.com:butze-mann/myosotis

Conflicts:
	application/controllers/UserController.php
	application/plugins/Auth/AccessControl.php