deleting a redundant activity
Merge remote-tracking branch 'upstream/master'
Work on TicketCreate activity
adding payment screen
Merge remote-tracking branch 'brad/master'

Conflicts:
	src/com/codefest_jetsons/activity/TicketCreateActivity.java
Merge remote-tracking branch 'abhi/master'

Conflicts:
	AndroidManifest.xml
	src/com/codefest_jetsons/activity/TicketCreateActivity.java
	src/com/codefest_jetsons/activity/TicketInfoActivity.java
merge