i dunno
Merge remote-tracking branch 'origin/master'

Conflicts:
	LmesSync/bin/LmesSync.apk
	LmesSync/bin/classes.dex
	LmesSync/bin/resources.ap_
	LmesSync/res/layout/activity_main.xml