Merge origin/master

Conflicts:
	src/database/connection/DbConnection.java
Merge origin/master

Conflicts:
	src/database/connection/DbConnection.java
Merge origin/master

Conflicts:
	src/database/connection/DbConnection.java