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

Conflicts:
	Bazaar/._BZRDetailViewController.h
	Bazaar/._BZRLoginViewController.m