merged v0.3-server files and updated desktop stuff