fix overlapping content
Merge branch 'timeline' into cms
better qr code
Merge branch 'cms' of github.com:Zwooosh/MT-Identity into cms