Merge origin/master

Conflicts:
	Beta FYS/src/connectivity/QueryManager.java
Merge origin/master
Merge origin/master