Merge branch 'newManual' of charmgit:charm into newManual