from commandLine
Merge branch 'master' of https://github.com/ssudhaka/aotg-cgi

Conflicts:
	add_doc_uncategorised.cgi