Doc update; refactor
Added Doxyfile
Merge develop