getting files in order for build
Merge remote-tracking branch 'origin/master'

Conflicts:
	settings.gradle
syncing files