blank commit.
Merge remote-tracking branch 'origin/mainactivity' into mainactivity

Conflicts:
	SplitDish/AndroidManifest.xml
Got TicketItems displaying properly in a ListView.