Timeline
Merge branch 'master' of https://github.com/rmja/ng-timeline

Conflicts:
	bower.json
	sample/app.js
	sample/index.html
	timeline/TimelineController.ts
	timeline/TimelineDirective.ts
	timeline/_all.ts
	timeline/timeline.ts