Merge branch 'basic_model_branch'
Merge branch 'master' of https://github.com/dawrut/eSothebys