EventList & CategoryGrid
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/java/edu/osu/uvento/contoller/UniversitySelectionActivity.java
version 0.1