Updated documentation for GurbaniDB 1.0 and 2.0
Fixed merge issues