first relationship complete
added relationship between merchant and item
getting selfs on classes
Add refs to self and sales_engine and improve test speed
Merged master, fixed conflict