Changed the world by moving classes and renaming packages
Split ApiCallback out of MXApiClient and into its own file
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/LoginActivity.java
	app/src/main/java/org/matrix/matrixandroidsdk/PublicRoomsActivity.java
	app/src/main/java/org/matrix/matrixandroidsdk/RoomActivity.java
	app/src/main/java/org/matrix/matrixandroidsdk/adapters/MessagesAdapter.java
	app/src/main/java/org/matrix/matrixandroidsdk/fragments/MatrixMessageListFragment.java
	app/src/main/java/org/matrix/matrixandroidsdk/fragments/MatrixMessagesFragment.java
	app/src/main/java/org/matrix/matrixandroidsdk/store/LoginStorage.java
	sdk/src/main/java/org/matrix/androidsdk/MXApiClient.java
Merge branch 'master' of https://github.com/matrix-org/matrix-android-sdk

Conflicts:
	app/src/main/java/org/matrix/matrixandroidsdk/adapters/MessagesAdapter.java
Merge branch 'master' of https://github.com/matrix-org/matrix-android-sdk

Conflicts:
	app/src/main/java/org/matrix/matrixandroidsdk/adapters/MessagesAdapter.java