bla
bla2
Merge branch 'master' of https://github.com/TamarAntebi/mineralyzer

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml