Fixed Merge Errors from Last Commit
check
Fixed ListsActivity Issues, connected to map.
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp