final
Merge branch 'master' of https://github.com/Wifin/WifinApp

Conflicts:
	bin/classes.dex
	bin/resources.ap_