FIX conflicts
ADD missing files
RMV wasted
CHG support for several connection string (para...
Merge branch 'master' of ssh://git.code.sf.net/...
RMV auto generated
CHG clean up