Change it to alert once when there is no flash fixes #9570
Allowing the users to see the batch edit and collection buttons but no the delete buttons on screens other than my files fixes #9595
cron job to remove processed files to free up processing space in /tmp fixes #9604
Solr rake tasks and cronjob
Adding a timeout to the derivative executable running so soffice does not hang.  fixes #9607
Removing puts and adding time in words to make the error output better.  refs #9607
Changing the timeout to 10 minutes and changing how we are calling time_ago_in_words
Changing which user is being used by the document lists so the collection can be viewed when no user is logged in.  fixes #9627
Merge branch 'release-2.0.5' into develop

Conflicts:
	config/schedule.rb
Merge branch 'develop' of github.com:psu-stewardship/scholarsphere into capistrano3
Modified deploy files for each environment to represent the new capistrano v3 format