locked gem versions
changed file download suggested names to include date and time
modified buttons on list pages
Merge branch 'master' into annotation_discussions

Conflicts:
	Gemfile.lock