done
Merge remote-tracking branch 'origin/Binh'

Conflicts:
	POS/src/edu/txstate/pos/MainActivity.java