Merge pull request #6 from jdhok/develop

Add current database name as prefix in cube rewriter
Preserve user specified join type