Merge pull request #1878 from bmorrise/dev

[BACKLOG-194] Fixed documentation formatting and added docs
[BACKLOG-195] Merge from oemdoc and minor code fixes