Moving around some asset packaging stuff.
WEB-4097 - worklist had some hard-coded english in it when the view was translated. Should be fixed now, but will run thorough testing in a bit.
Renamed 'phe' (?) to 'association' in the dato controller.
Added Pinterest logo to footer #WEB-4167; Changed display of alternative match in search results #WEB-3979; Add article and link failures resolved #WEB-4003; Can now add alt attribute to links in CKeditor #WEB-4150; Fixed march of life empty slots #WEB-4189
TWN suggestions, part 1 of 2
Merge branch 'master' of github.com:EOL/eol
Locked in the versions of things that we were using in the Gemfile.
Upgraded to latest Rails.
establish_connection_with_octopus
Fixing another to_i error in specs... which are still passing, but Staging isn't happy yet.
Setting logging models explicitly... inheritence wasn't working, but calling it directly seemed to be (on staging)... (now with more files)
Merge branch 'master' of https://github.com/EOL/eol

Conflicts:
	Gemfile
	Gemfile.lock
update zh-Hans.yml