Merge pull request #15 from usik/master

Got rid of google location button.
editing legend layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java
removed location button in top right
Fixed merge conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java
Fix login to ignore case in username

It was getting annoying typing in the username and having it declined
because the first letter was capitalized
finish key legend
Merge branch 'master' of https://github.com/OJ7/CampusEventsApp
updated key legend
Changed add event xml.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java