add method Chapter.getShortName()
Merge branch 'master' into event_menu

Conflicts:
	app/src/main/java/org/gdg/frisbee/android/widget/UpcomingEventWidgetProvider.java