Merging
Merge branch 'master' of https://github.com/nowid50/arrowseye

Conflicts:
	res/values/strings.xml