APS workspace

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

Conflicts:
	GroupProjectSource/APS/.project
	GroupProjectSource/APS/.settings/.jsdtscope
	GroupProjectSource/APS/.settings/org.eclipse.jdt.core.prefs
	GroupProjectSource/APS/.settings/org.eclipse.wst.common.component
	GroupProjectSource/APS/.settings/org.eclipse.wst.common.project.facet.core.xml
	GroupProjectSource/APS/WebContent/META-INF/MANIFEST.MF
	GroupProjectSource/APS/derby.log
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/UserDataAccess.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/Customer.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/User.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/oldDontDelete/AccountDetails.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/oldDontDelete/ContactInformation.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/oldDontDelete/Credentials.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/entities/oldDontDelete/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/AccountDetailsVO.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/ContactInformationVO.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/CredentialsVO.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/LogonCredentials.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/PaymentDetails.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/domain/vo/VO.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/enumtypes/AccountType.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/enumtypes/ContactType.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/enumtypes/NotificationType.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/enumtypes/PaymentType.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/enumtypes/StatusType.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/exception/ApplicationException.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/exception/DataBaseInsertException.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/exception/DatabaseException.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/exception/LogonCredentialsValidationException.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/exception/LogonExecption.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/notification/ConfirmationNotification.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/notification/DatabaseNotification.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/notification/EmailNotification.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/notification/FileNotification.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/notification/Notification.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/notification/SMSNotification.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/security/EncryptionModule.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/security/EncryptionModuleImpl.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/credentials/EncryptedUserInformationSpecification.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/src/za/ac/wits/elen7045/group3/aps/services/util/DateUtil.java
	GroupProjectSource/APS/src/za/ac/wits/elen7045/group3/aps/services/validation/LogonCredentialsValidation.java
	GroupProjectSource/APS/test/META-INF/orm.xml
	GroupProjectSource/APS/test/META-INF/persistence.xml
	GroupProjectSource/APS/test/res/spring/application-context-test.xml
	GroupProjectSource/APS/test/test/XSTreamTest.java
	GroupProjectSource/APS/test/test/za/ac/wits/group3/domain/mock/MockUserDAOImpl.java
	GroupProjectSource/APS/test/test/za/ac/wits/group3/mock/proxy/APSMockObjectGenerator.java
	GroupProjectSource/APS/test/test/za/ac/wits/group3/mock/proxy/MocksInvocationHandler.java
	GroupProjectSource/APS/test/test/za/ac/wits/group3/register/tests/user/InsertUserTest.java
Fixed Conflicts