что-то изменил
Merge branch 'master' of https://github.com/spacesoldier/SberStarter

Conflicts:
	SberStarter/res/drawable-hdpi/ic_launcher.png
	SberStarter/res/drawable-mdpi/ic_launcher.png
	SberStarter/res/drawable-xhdpi/ic_launcher.png
	SberStarter/res/drawable-xxhdpi/ic_launcher.png