Merge "Add '@addtogroup' tag to generate doxygen page" into devel/master