Merged and updated doxygen and github documentation