Begin work on post-invitation user block/unblock (#134)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Implement unblock (#134)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' into blockuser
Merge branch 'master' into blockuser
Merge branch 'master' into blockuser
Merge branch 'master' into blockuser
Add blocked column to users provider

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Implementing blocklist request during sync (part 1, #143)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Implementing blocklist request during sync (part 1, #134)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'blockuser' of github.com:kontalk/androidclient into blockuser
Request blocklist and set block status (untested; #134)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Fix XEP-0191 implementation

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Contact: include blocked status

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Block/unblock menu item (#134)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Block/unblock: wait for IQ response and update UsersProvider

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Block/unblock: notify user when blocking and subscribe when unblocking

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' into smack4

Conflicts:
	src/org/kontalk/ui/ComposeMessageFragment.java

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>