Merge branch 'master' into develop
- Correct dbconfig_sample.php
Merge branch 'develop'