Changes made by Yonatan to send JSON object as params
Completed save-as-json, started working on UI
Added buttons. crashes on height problems
Check-In data goes through files, allowing for offline scenarios
new drawables
gitignore
removing useless files
Pre-merge with JSON branch
Update .gitignore
Removing files, preparing merge from mabcook
added gitignore and removed some files
Merge branch 'SendJSON' of https://github.com/YishTish/SEP_Patrol_Native
into SendJSON

Conflicts:
	.gitignore
	bin/R.txt
Synchronizing with Remote
files that should be removed when merge with head is complete
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
adding files before merge with sendJSON
Merged SendJSON