Work
Merge remote-tracking branch 'brad/master'

Conflicts:
	src/com/codefest_jetsons/activity/TicketCreateActivity.java
Merge remote-tracking branch 'upstream/master'
hooking up data