0
Merge branch 'master' of https://github.com/xiechao06/lite-mms

Conflicts:
	lite_mms/portal/cargo/views.py