fixed bug
Merge branch 'master' of github.com:tbotaq/timeline-viewer-on-rails
fixed bug