branch master
Merge branch 'master' of https://github.com/robzlabz/WebStat

Conflicts:
	cron.php