More doxygen and tiny bugfixes
Merge branch 'master' of git://github.com/spk121/jozabad

Conflicts:
	src/diag.h