fix typo
added valuation model and functionality
merged stuff
added valuation upload
Merge branch 'master' into development3