fix
Merge branch 'master' of https://github.com/Valvadis/timeline-rails
fix