added context manager
fixed conflict
localized
Merge branch 'master' of git://github.com/jstavel/cdbazar

Conflicts:
	locale/cs_CZ/LC_MESSAGES/django.mo
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of git://github.com/jstavel/cdbazar
locales
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of git://github.com/jstavel/cdbazar
Merge branch 'master' of github.com:jstavel/cdbazar

Conflicts:
	locale/cs_CZ/LC_MESSAGES/django.mo