Fixed problem with time
Merge branch 'master' into tizen2