Restore .gitignore and SETUP.md, remove files that were added
Update the submodule version to the restored .gitignore
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	android.iml