add some pic
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity.class