Implement blocking/unblocking users
Merge branch 'master' into acl_graph