Datbase Query
Merge branch 'master' of github.com:ARDevOp/Augmented_Project

Conflicts:
	ARWeb/src/main/java/core/services/AccountService.java
	ARWeb/src/main/java/core/unitofwork/ServiceUnit.java
	ARWeb/src/main/java/dal/connnection/ConnectionHelper.java