Merge origin/master

Conflicts:
	src/DAL/DBConnection.java
Merge origin/master

Conflicts:
	src/DAL/DBConnection.java