Fixed EN translation
Merge branch 'dev'
Merge branch 'dev'
fix bug of date using js file jquer.annotate.js (database info column inconsistency not solved)
Merge branch 'master' into dev