Updating add event xml
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/example/campuseventsapp/MainActivity.java
merging Omid's codes
Merge pull request #15 from usik/master

Got rid of google location button.