A
B
C
E
Merge remote-tracking branch 'origin/rem_rebased_branch' into rem_rebased_branch

Conflicts:
	res/values/strings.xml
Merge pull request #9 from igor-ismagilov-alu/rem_rebased_branch

rem_rebased_branch