Merge branch 'master' of https://github.com/franck

Conflicts:
app/views/directives/timeLine.html
app/views/partials/timeline.html
merge test...