add labs style
Merge branch 'dev'
set file charset
Merge branch 'dev'
add time
try to use key
try to use key
add ignore and fix share detail bug
edit gallery disk manager
add upload to ignore
Delete ������.jpg
edit gallery and upload
try to resolve conflict