add locale initializer
update gems + rails 4.16
deploy
add new cookie init
update rails4.1 initializers
pin rails4.1.6
merge conflict