finalized tags added
floor-wise selection of spinners
Merge remote-tracking branch 'origin/master'

Conflicts:
	wifitesterProject/wifitester/src/main/res/values/strings.xml