Refactoring
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS

Conflicts:
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/scrape/MunicipalScrapeStrategy.java