Finished Add Event, Map Location working
Merge branch 'master' of https://github.com/j-a-c/mdevproject.git

Conflicts:
	src/com/joshuac/campusconnect/MapActivity.java
Merge branch 'master' of https://github.com/j-a-c/mdevproject

Conflicts:
	src/com/joshuac/campusconnect/MapActivity.java
Add markers to map with location