Class diagram changed beyond recognition.
Merge branch 'master' of https://github.com/MarketTeam/Market