lien
lien
Merge branch 'master' of https://github.com/K4PSuL/TouchWin

Conflicts:
	bin/classes/com/iia/touchwin/R$id.class
	bin/classes/com/iia/touchwin/views/MainActivity.class
	gen/com/iia/touchwin/R.java