Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
	build.gradle