image storage server ready for protocol usage/database missing
merge conflicts resolved in ServerTest