Updates on some functions.
Merge branch 'master' of https://github.com/MusicCityCenter/Android

Conflicts:
	MCCClient/app/src/main/java/org/magnum/mccmap/EventFragment.java