Update minSdkVersion to "L", and theme to "Theme.Material"
Theme.Material.Light fits better with the settings activity
Merge .gitignore files across branches
Merge branch 'android-L-updates'

Conflicts:
	project.properties
Use material theme for preferences
Allow file:// urls