bugfix
bugfix
bugfix
Merge branch 'master' of server.nlware.com:mindaphp

Conflicts:
	templates/docs.php
	web/debugger/index.php