Merge branch 'master' of https://github.com/bojanstef/ModuleGUI

Conflicts:
	bin/ModuleGUI.apk
	bin/classes.dex
	bin/classes/ca/sbojan/modulegui/MainActivity.class
	bin/resources.ap_
	src/ca/sbojan/modulegui/MainActivity.java
Try 2

asdf