Add Files
Add Doxygen File
Merge branch 'dev'