Split MXApiCLient out into separate ApiClient classes
Merge branch 'master' of https://github.com/matrix-org/matrix-android-sdk

Conflicts:
	app/src/main/java/org/matrix/matrixandroidsdk/HomeActivity.java
	app/src/main/java/org/matrix/matrixandroidsdk/PublicRoomsActivity.java