Fixed problem with date
Merge branch 'master' into tizen2