partial timeline fix and dynamic form beginnings
Merge branch 'timeline_fix'

Conflicts:
	Gemfile
	Gemfile.lock