Push all changes from main branch (#22, #23)
Merge commit
Merge remote-tracking branch 'origin/last-eclipse-build-fork' into last-eclipse-build-fork_merge-issue-1

Conflicts:
	res/values/strings.xml