commit date is more useful than author date
Merge branch 'master' into gilt
adding jira user
adding ctrl-p
Merge branch 'master' into gilt