merges
Merge branch 'master' of github.com:saumyadalal/Bazaar-2.0