test
Merge branch 'master' of github.com:igrir/teroka

Conflicts:
	res/drawable-hdpi/bg.png
	res/drawable-mdpi/bg.png
	res/drawable-xhdpi/bg.png