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
Fixed bug with not being able to add multiple Subject Names. DHH-296
Removed collection images from the object view.(DHH-318)
Adding flash messages back to homepage (DHH-314)
Updating note indexing so generic notes are indexed in otherNote_tesim and otherNote_json_tesim instead of being mixed in with note_tesim.  This keeps the record display the same and gets rid of duplicate note values in search results (DHH-317)
updated sessions configure file for customized logout display.(DHH-314)