initial
Merge http://github.com/saumyadalal/Bazaar-2.0