resolve conflicts
comment peripheral tables
Implement validation to Word and XML export
Resolve merge conflicts
complete comments for 4 controllers
fix conflict representerController
modify the comments of 19 controllers
resolved conflict from merging dev/master