LogonService and BillingAccountService

LogonService and BillingAccountService
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS

Conflicts:
	GroupProjectSource/APS/.classpath

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/UserDataAccess.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/User.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/repository/user/CustomerRepository.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/repository/user/CustomerRepositoryImpl.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/LogonCredentials.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/AndEqualsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/ApplicationSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/NotEqualsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/OrEqualsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/Specification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/credentials/CapturedCredentialsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/credentials/EncryptedCredentialsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/notification/ConfirmSendNotification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/user/EncryptedUserInformationSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/user/UserSpecificationByID.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/util/ApplicationContants.java
	GroupProjectSource/APS/test/res/spring/application-context-test.xml

	GroupProjectSource/APS/test/test/za/ac/group3/accounts/test/AccountDataAdditionTest.java

	GroupProjectSource/APS/test/test/za/ac/group3/accounts/test/AccountDataRepositoryBasicTest.java

	GroupProjectSource/APS/test/test/za/ac/wits/group3/domain/mock/MockUserDAOImpl.java

	GroupProjectSource/APS/test/test/za/ac/wits/group3/register/tests/user/InsertUserTest.java
	workspace/APS/build/classes/res/spring/application-context-test.xml
Merge branch 'master' of https://github.com/Group3-ELEN7045/APS

Conflicts:
	DataScraperAnalysis/Spec Examples.xlsx
	GroupProjectSource/APS/.classpath

	GroupProjectSource/APS/build/classes/res/spring/application-context-test.xml

	GroupProjectSource/APS/build/classes/test/za/ac/group3/accounts/test/AccountDataAdditionTest.class

	GroupProjectSource/APS/build/classes/test/za/ac/group3/accounts/test/AccountDataRepositoryBasicTest.class

	GroupProjectSource/APS/build/classes/test/za/ac/wits/group3/domain/mock/MockUserDAOImpl.class

	GroupProjectSource/APS/build/classes/test/za/ac/wits/group3/register/tests/user/InsertUserTest.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/UserDataAccess.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/abtracts/AbstractAccount.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/accounttypes/CreditCardAccount.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/accounttypes/MunicipalAccount.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/accounttypes/TelcoAccount.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/interfaces/AccountDataRepository.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/repository/AccountDataManager.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/accounts/repository/AccountRepository.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/entities/User.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/repository/user/CustomerRepository.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/repository/user/CustomerRepositoryImpl.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/AndEqualsSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/ApplicationSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/NotEqualsSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/OrEqualsSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/Specification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/credentials/CapturedCredentialsSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/credentials/EncryptedCredentialsSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/notification/ConfirmSendNotification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/user/EncryptedUserInformationSpecification.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/specification/user/UserSpecificationByID.class

	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/services/util/ApplicationContants.class

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/UserDataAccess.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/User.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/repository/user/CustomerRepository.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/repository/user/CustomerRepositoryImpl.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/LogonCredentials.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/AndEqualsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/ApplicationSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/NotEqualsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/OrEqualsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/Specification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/credentials/CapturedCredentialsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/credentials/EncryptedCredentialsSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/notification/ConfirmSendNotification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/user/EncryptedUserInformationSpecification.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/specification/user/UserSpecificationByID.java

	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/util/ApplicationContants.java
	GroupProjectSource/APS/test/res/spring/application-context-test.xml

	GroupProjectSource/APS/test/test/za/ac/group3/accounts/test/AccountDataAdditionTest.java

	GroupProjectSource/APS/test/test/za/ac/group3/accounts/test/AccountDataRepositoryBasicTest.java

	GroupProjectSource/APS/test/test/za/ac/wits/group3/domain/mock/MockUserDAOImpl.java

	GroupProjectSource/APS/test/test/za/ac/wits/group3/register/tests/user/InsertUserTest.java
Revert "Merge branch 'master' of https://github.com/Group3-ELEN7045/APS"

This reverts commit 2169fc8eb7b6d301d26ee1cbad5c6280ec759bf0.

Conflicts:

	GroupProjectSource/APS/build/classes/test/za/ac/wits/elen7045/group3/login/tests/testUserLogin.class

	GroupProjectSource/APS/build/classes/test/za/ac/wits/group3/domain/mock/MockUserDAOImpl.class
update user changes

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

Conflicts:
	GroupProjectSource/APS/build/classes/test/XSTreamTest$DummyClass.class
	GroupProjectSource/APS/build/classes/test/XSTreamTest.class
	GroupProjectSource/APS/build/classes/za/ac/wits/elen7045/group3/aps/domain/vo/DataPair.class