Initial commit
Merge branch 'release/1.0'

Conflicts:
	build.gradle