Merge branch 'master' of https://github.com/Shiro-Raven/DBEngineGUC

Merge branch 'master' of https://github.com/Shiro-Raven/DBEngineGUC

Final Version for Milestone 2. Javadoc added.

fix: the minor error in Reda's code