Merge with timeline
Merge with content branch
Changed timeline.js
Removed timeline css from main.css
Added timeline.css to index.html
Added timeline.css and changed timeline.html
Add retire to grunt tasks
Merge branch 'master' of https://github.com/librecms/librecms into content