updated various files
Merge branch 'master' of https://github.com/loganwilliams/fo-docm