#879 write contents to file using correct attribute
Use fork of docsplit until pull request is merged to allow IM/GM and current libreoffice compatibility
Lock datepicker version and change docsplit branch
closes #880 converted document preview
remove 'see log' phrase
Remove jquery-timepicker-rails and close #885
Merge branch 'master' of github.com:concerto/concerto

* 'master' of github.com:concerto/concerto:
  remove 'see log' phrase
  closes #880 converted document preview
Reverting cf1df9c7ceb31600c286e5880e3eb5d1b842daf1
close #885 update timepicker and specify new location of datepair
fix #882 if preview exists it should be the only media record
Add hardware plugin to plugins gemfile, as well as seeds.rb
Forgot the gemfile lock
Add concerto-hardware db stuff
close #883 use docsplit api instead of cmdline
upgrade to rais 3.2.17
Bump to 0.8.7.julietjaguar.
Show dynamic content for moderation if a parent is not being moderated, close #868.
Allow content to control what field and screens it is displayed in.

Content classes now include a can_display_in? method which contains the logic we use to see if a piece of content should be rendered in a specific <screen, field>.  To provide parity with the default behavior, we simply make sure that the Field.Kind == Content.Kind.
Close #892 and make the suggested change to the pg/mysql detection..ugh
Fix plugin routing - temporary workaround for #893

This allow plugins to be routable in production mode, rather than
getting 404s. It is not a permanent solution, however, because 404
and 500 handling is poor.