added my code
Added Scan Activity and a 'skip to scan' button on the main activity;
changed minSDKversion to 11 and theme to system:holo
transferred all code over
Merge remote-tracking branch 'origin/geoff'

Conflicts:
	POS/AndroidManifest.xml
	POS/res/values/strings.xml
	POS/src/edu/txstate/pos/MainActivity.java
Merge remote-tracking branch 'origin/Binh'

Conflicts:
	POS/AndroidManifest.xml
	POS/res/values/strings.xml
Changed backend server