v0.0.6
Merge remote-tracking branch 'origin/master' into material

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	mobile/build.gradle