Merge branch 'master' of https://github.com/zenyagami/autochilango

Conflicts:
	src/com/hackdf/autochilango/MainActivity.java
changes?