Merge pull request #2 from ThorstenHi/master

log and show timestamp
.
Merge remote-tracking branch 'origin/master'
entity repo
new flashbag
Merge remote-tracking branch 'upstream/master' into HEAD
fix flashbag