bug_1042
Merge branch 'master' into bug_1042
bug_1042, IE fix only for timeline tab
Merge pull request #9 from kkorekk/bug_1042

bug_1042