Splash2605
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/drawable-hdpi/searchbutton.9.png
	app/src/main/res/drawable-mdpi/searchbutton.9.png
	app/src/main/res/drawable-xhdpi/searchbutton.9.png
	app/src/main/res/drawable-xxhdpi/searchbutton.9.png
Splash2705