modified block_function
Merge remote-tracking branch 'upstream/master'
rollback block_user, add unblock_user function
Merge remote-tracking branch 'upstream/master'
Merge pull request #95 from lampslave/master

add unblock_user view