After presentation commit
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS

Conflicts:
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/scrape/vo/MunicipalStatementConverter.java
	GroupProjectSource/APS/test/res/spring/application-context-test.xml
	GroupProjectSource/APS/test/test/za/ac/wits/elen7045/group3/domain/mock/FakeBillingStatementDB.java