update mann and man1
Merge branch 'master' of https://github.com/Lambwatt/Global2014