Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse into develop
fix webclient to know about right timestamps
Merge pull request #9 from matrix-org/develop

Fix issue with timestamps in webclient