Merge pull request #1274 from annando/issue-1218

Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined

diff --cc boot.php
Simple merge

diff --cc include/dbstructure.php
Simple merge