upped speed of import
Increase editing lines point limit
Merge branch 'dev'