style
Merge branch 'master' of https://github.com/Domethic/MeData

Conflicts:
	res/values/strings.xml