push/pull test
Merge branch 'master' of https://github.com/knawrot/RobotsManagement

Conflicts:
	res/values/strings.xml