Background y Button
Merge branch 'master' of https://github.com/conti89/rooner

Conflicts:
	Roonner/res/values/strings.xml
Strings
Style
Merge branch 'master' of https://github.com/conti89/rooner