Temp
Merge branch 'master' of https://github.com/FanChuang/cbirpff

Conflicts:
	cbirpff/cbirpff/__init__.pyc
	cbirpff/cbirpff/urls.pyc
	cbirpff/cbirpff/views.pyc
	cbirpff/settings.pyc
	cbirpff/wsgi.pyc
Merge branch 'master' of https://github.com/FanChuang/cbirpff