Merge pull request #1 from tomaszrondio/master

add: timeline.js view
add silex app, move timeline
Merge pull request #2 from ahilles107/master

add silex app, move timeline
timeline fix