divkovi1 Merge branch 'master' of https://github.com/msemm/Keypad-Mapper-3.git
0c81f10 Jun 13, 2013
Merge branch 'master' of https://github.com/msemm/Keypad-Mapper-3.git 
Conflicts:
	enaikoon_resources_lib/gen/de/enaikoon/android/library/resources/R.java
0c81f10