takes into account theme-merge

- merged with 'theme-merge'
- theme-merge breaks line 87 of timeline.js
- to see 'actions' on timeline.js, if have too reduce your window (terrible css)

Can someone please explain to the integrator how to use bower:
- to add new dependency: 'bower install <package-name> --save
- /bower_components and app/bower_components are in .gitignore for a reason.