added my code
transferred all code over
Merge remote-tracking branch 'origin/Binh'

Conflicts:
	POS/AndroidManifest.xml
	POS/res/values/strings.xml