Merge remote-tracking branch 'origin/master'

Conflicts:
	Pro/anybuy/anybuy/settings.pyc
	Pro/anybuy/db.sqlite3
	Pro/anybuy/system/__init__.pyc
	Pro/anybuy/system/admin.pyc
	Pro/anybuy/system/models.py
	Pro/anybuy/system/models.pyc