Merge branch 'doc_update'
Merge branch 'master' of https://github.com/kellyschrock/apm_planner