included settings images
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/drawable-hdpi/ic_settings_gray.png
	app/src/main/res/drawable-xhdpi/ic_settings_gray.png