new starting point - from ofc commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
more commits