WoZ NDEF Tagging... intent sent... need to parse.
Parsing works. Animated list adapter works. w00t!
?
Merge branch 'refactor_nfc'

* refactor_nfc:
  ?
  Parsing works. Animated list adapter works. w00t!
  WoZ NDEF Tagging... intent sent... need to parse.

Conflicts:
	bin/AndroidManifest.xml
	gen/edu/berkeley/cs160/qUp/R.java
	res/layout/my_q.xml
	res/layout/reservation_search.xml
integrations
Merge remote-tracking branch 'origin/master'

* origin/master:
  Reformated a few things
  Debugging
  Added menu navigation stuff
  Added reservation java files
  Added java files for layouts

Conflicts:
	AndroidManifest.xml
	gen/edu/berkeley/cs160/qUp/R.java
	res/layout/my_q.xml
	res/values/strings.xml
	src/edu/berkeley/cs160/qUp/TagInHandler.java
	src/edu/berkeley/cs160/qUp/activities/MyQActivity.java
integrations
Merge remote-tracking branch 'origin/master'

* origin/master:
  Made sure Personal mode worked
  FIxed intent logic mixup
  Fixed reversed button ids

Conflicts:
	gen/edu/berkeley/cs160/qUp/R.java