Merge pull request #63 from gAmUssA/master

refactored ch7, ch8. moved grunt into to appendix_a
fixes in mediator section