Migrations added
User's blocked field refactored to use state machine
Typo fixed
Merge pull request #3143 from Undev/state-machine-3

State machine 3