Updating prod server name
Adding asset precompilation
Including js/uglifier in prod for asset precompilation (DAMSKEY-449)
Trying to get asset precompilation to work in prod
Assets again
Assets, again
Asset precompile
Merge branch 'develop'

Conflicts:
	config/environments/production.rb
Adding version number for i18n to resolve deployment issue (DHH-265)
Updating Gemfile.lock (DHH-265)
Adding leaflet.js to list of separately-compiled resources (DHH-265)
Adding L.TileLayer.Zoomify.js to precompiled js list (DHH-265)
Adding leaflet.css to precompiled css list (DHH-265)
Merge branch 'release/1.0-rc1'

Conflicts:
	config/environments/production.rb
Merge branch 'release/1.0-rc2'

Conflicts:
	config/environments/production.rb
Removing unneeded .first so sort title isn't truncated to first character
Moving access control logic for paging search results from request scope to controller scope (DHH-323)
Merge branch 'hotfix/1.0-rc3' into develop
Merge branch 'develop' of github.com:ucsdlib/damspas into develop