fixed conflicts - DBHelper.php, header.php
fixed config.php conflict
Merge pull request #302 from igoryen/issue#268

Issue#268