Getting Location-based parameters (contd.)
testing project.properties should be ignored
Delete project.properties
fff
Added option menu with one item to change registration info
Testing OAuth on new file
menu
Merge branch 'master' of https://github.com/YishTish/SEP_Patrol_Native.git
Merge branch 'master' of
https://github.com/YishTish/SEP_Patrol_Native.git

Conflicts:
	project.properties
merged from Windows
Merge branch 'master' of https://github.com/YishTish/SEP_Patrol_Native.git
Working on oauth
Merge remote-tracking branch 'origin/master' into SendJSON

Conflicts:
	.classpath
	.gitignore
	bin/R.txt
	bin/resources.ap_
	project.properties
	res/layout/activity_main.xml
	src/com/yishai/sep_patrol/CheckInLocation.java
	src/com/yishai/sep_patrol/Constants.java