Merge branch 'master' of https://github.com/MisterX25/Lima

Conflicts:
	bin/classes/cpnv/jav1/lima/Menu.class
	bin/classes/cpnv/jav1/lima/R$layout.class
	bin/classes/cpnv/jav1/lima/R$string.class
	gen/cpnv/jav1/lima/R.java