updated build files
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	build.gradle
	build/intermediates/model_data.bin