change field name
add column information to admin interface
add column information to admin interface
Merge remote-tracking branch 'origin/master'