DoxyGen comments

have to commit to be able to sync
fix conflicts

conflicts fix