Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/xabber/android/data/extension/muc/MUCManager.java
	app/src/main/java/com/xabber/android/ui/ConferenceAddFragment.java