test1
Merge commit 'aa9bf78af35301291b1ef145475c6ed3429b8b46'

Conflicts:
	AndroidManifest.xml
	ic_launcher-web.png
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
	res/values/strings.xml
clean