Enable more doxygen features (include JS search engine) and one doxygen annotation fix
Merge pull request #161 from amai2012/maibranch

Enable more doxygen features (include JS search engine) and one doxygen ...