v3.1 final with updated resources
Merge branch 'master' of https://github.com/msemm/Keypad-Mapper-3.git

Conflicts:
	enaikoon_resources_lib/gen/de/enaikoon/android/library/resources/R.java