correction of when by stamp
Merge branch 'master' of ssh://www.github.com/compatibleone/accords-platform