Refactored DB
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Server/src/main/resources/arch/galaxyeclipse/server/util/obj_script.properties