Completely fixed date inline-editing
fixed conflict
Merge branch 'new_editproject1' into new_editproject