Merge pull request #551 from leider/master

formatting of date and time is now done in jade files only, not at model level