Merge local changes. Add options for scripts and fix several bugs. Support svn user and password in command line.