Added dev server and file watch support for development