Added topic 6 formulas and units
build file modifications
Build
Merge branch 'feature/topic6' into develop