adding TimelineController
Merging project setup
Merge branch 'develop'
Merge branch 'develop' into timeline
updating to angular 1.2.0-rc.3 (routing module was split out as a dep