Merge origin/master

Conflicts:
	src/java/Model/ConnectionBuilder.java
Merge origin/master