merge dev

basic server running