Merging new training manual into master