Made friendlyName for an event use self.name if self.short_name is nil.
Made friendlyName for an event use self.name if self.short_name is nil.

the-blue-alliance/the-blue-alliance-ios,the-blue-alliance/the-blue-alliance-ios