local commit
add css or js files
add select2
add bootstrap
add html
local commit
local commit
local commit
thumbnail
local commit
css modify
default url
css modify
permission edit
css modify
Merge remote-tracking branch 'origin/master'

Conflicts:
	lite_mms/models.py
	lite_mms/templates/timeline/timeline.html
modify cargo
Merge remote-tracking branch 'origin/master'

Conflicts:
	lite_mms/log/handler.py