Swap to use except over on. Should fixes #173.

Signed-off-by: crynobone <crynobone@gmail.com>
Update changelog

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Merge branch '2.2'

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	src/Foundation/Routing/UsersController.php