active filtering from campus and type done
Merge branch 'master' of https://github.com/NewSpring/NSMaps
removed console in method
filter merge conflicts done