Add smack-java7
Merge branch 'master' into sasl

Conflicts:
	settings.gradle