push Gemfile.lock
[#64809256, #64809274, #64809246] create layout for map view
update geokit-rails3 to geokit-rails
fix letter field creation for globalize
add devis secret key and fix cancan_subjects.yml associations
update integration changes
fix merge errors