date fix
Merge branch 'zhcard_dev' of https://github.com/mwana/mwana into zhcard_dev