fix strtotime(), date()
Merge branch 'develop'