modifiche per splash
modifiche per splash (prova)
resolve merge
rename default splashscreen
Merge branch 'master' of https://github.com/sittizen/org.liblab.MatrimoniSolidali

Conflicts:
	res/screen/android/drawable-hdpi/screen.png
	res/screen/android/drawable-ldpi/screen.png
	res/screen/android/drawable-mdpi/screen.png
	res/screen/android/drawable-xhdpi/screen.png
	res/screen/android/screen-hdpi-portrait.png
	res/screen/android/screen-ldpi-portrait.png
	res/screen/android/screen-mdpi-portrait.png
	res/screen/android/screen-xhdpi-portrait.png
	res/screens/android/drawable-hdpi/screen.png
	res/screens/android/drawable-ldpi/screen.png
	res/screens/android/drawable-mdpi/screen.png
	res/screens/android/drawable-xhdpi/screen.png