Merge branch 'oc2013' into 'master'

Oc2013

See merge request !132

app/controllers/proxy_logs_controller.rb

@@ -50,7 +50,7 @@ class ProxyLogsController < ApplicationController
                         while(a.length < 200)
                             if a.length == 0
                                 log.tail(1) do |line|
-                                    if !line.start_with?("10.17.0.2")
+                                    if !(line.include?("Wget") || line.include?("curl"))
                                         a.append(line)
                                         log_index = log_index + 1
                                     end
@@ -61,7 +61,7 @@ class ProxyLogsController < ApplicationController
                                         a.append(nil)
                                         log_index = log_index + 1
                                     else
-                                        if !line.start_with?("10.17.0.2")
+                                        if !(line.include?("Wget") || line.include?("curl"))
                                             a.append(line)
                                             log_index = log_index + 1
                                         end