Updated to latest BIMserver code