Bump odi_content_models version
Add datepicker gem
Add views for timed item
Wrap strftime in `try`

We get errors when `end_date` is blank
Bump content models version
Add article templates
Add case study templates
Bump content models version
Add FAQ template
Bump content models version
Add date picker gem
Add jobs template
Add date picker gem
Bump content model version
Add organisation view
Merge branch 'feature-add-articles' of github.com:theodi/publisher into feature-20-add-additional-models
Merge branch 'feature-add-case-studies' of github.com:theodi/publisher into feature-20-add-additional-models
Merge branch 'feature-add-faqs' of github.com:theodi/publisher into feature-20-add-additional-models

Conflicts:
	Gemfile.lock
Merge branch 'feature-add-jobs' of github.com:theodi/publisher into feature-20-add-additional-models

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.css
Merge branch 'feature-add-organizations' of github.com:theodi/publisher into feature-20-add-additional-models

Conflicts:
	Gemfile.lock