removed location button in top right
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java
finish key legend
Merge branch 'master' of https://github.com/OJ7/CampusEventsApp