Removing main/conference see #6713
Removing main/portfolio see #6713
Updating from 1.9.x
Removing unused timeline tool.
Minor - format code.
Updating from sandbox