.
Merge branch 'master' of https://github.com/salyangoz/howto.git

Conflicts:
	HowTo/res/drawable-xxhdpi/ic_launcher.png