show match date time in active scaffold
Merge branch 'Eran'
fixed wrong warning in import
prevent development.log from growing
Merge branch 'master' into Eran