test git #2
Merge branch 'master' of https://github.com/Termchai/Pos_by_RTT_KU.git

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