Merge branch 'release/1.2' into dev
[issue #53] no timestamp contains seconds anymore
Merge branch 'bug/53-reset-all-timestamps-to-zero' into dev
bumped release version to 1.2.1
resolved conflicts while merging v1.2.1