Merge remote-tracking branch 'remotes/origin/dev' into dev

Conflicts:
	Server/src/main/java/arch/galaxyeclipse/server/data/DbScriptExecutor.java
	Server/src/main/java/arch/galaxyeclipse/server/util/LocationObjectsPopulator.java
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Server/src/main/java/arch/galaxyeclipse/server/data/DbScriptExecutor.java
Admin console
Merge remote-tracking branch 'origin/dev' into dev
Modify properties file
Merge remote-tracking branch 'origin/dev' into dev