conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	HIOFCommuting/bin/HIOFCommuting.apk
	HIOFCommuting/bin/classes.dex