update .gitignore
update comment for doxygen
Merge remote-tracking branch 'origin/master'
change file encoding to utf-8