Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/models/my_aes_crypt.rb

@@ -62,8 +62,9 @@ class MyAesCrypt
 
 		shop_json = JSON.parse(shop_data)	
 		shop_json["data"].each do |j|
-			if j["lookup"] == from				
-				if(j["value"]["key"] == token)
+			if j["lookup"] == from			
+				# add [0...44] for production cloud for remove \n
+				if(j["value"]["key"][0...44] == token)
 					return true
 				end
 			end

config/initializers/mysql2_adapter.rb

@@ -24,7 +24,7 @@ module ActiveRecord
       end
 
       client = Mysql2::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:wait_timeout], 0]
       ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
     end
   end