Normalizing line endings
Merge branch 'master' of https://github.com/lucasfe/Casorio

Conflicts:
	AndroidManifest.xml
	gen/com/android/casorio/R.java