Init
Merge branch 'master' of github.com:Stoyicker/lolin1-data-provider

Conflicts:
	build.gradle