Translated some texts
Merge branch 'master' of https://github.com/Allavaz/Android-App

Conflicts:
	.classpath
	res/layout/activity_main.xml
	res/menu/order.xml
	res/values/strings.xml