Merge branch 'master' into audio_message

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>

Conflicts:
	app/build.gradle
Upgrade to Android Gradle plugin 0.13 and Gradle 2.1

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Workaround zip problem by logging but ignoring exceptions (fix #220)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Validate manual server address (fix #223)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Update emojicon commit pointer

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Use Smack implementation of RegistrationProvider (fix #225)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Upgrade to Smack 4.1.0-alpha3

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Upgrade client-common-java commit pointer

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>
Merge branch 'master' into audio_message

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>

Conflicts:
	app/build.gradle
Merge branch 'audio_message' into ptt_message

Signed-off-by: Andrea Cappelli <a.cappelli87@gmail.com>

Conflicts:
	app/build.gradle