Merge branch 'master' of https://github.com/asciimoo/searx into code_results

Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html

18 files changed, 2 insertions, 0 deletions

diff --git a/searx/static/themes/oscar/img/icons/README.md b/searx/static/themes/oscar/img/icons/README.md
new file mode 100644
index 000000000..0e3ad1c03
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/README.md
@@ -0,0 +1,2 @@
+Source: http://www.iconspedia.com/pack/flat-gradient-social-icons-4384/
+License: Free for non commercial use.
diff --git a/searx/static/themes/oscar/img/icons/amazon.png b/searx/static/themes/oscar/img/icons/amazon.png
new file mode 100644
index 000000000..4f330f38e
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/amazon.png
diff --git a/searx/static/themes/oscar/img/icons/dailymotion.png b/searx/static/themes/oscar/img/icons/dailymotion.png
new file mode 100644
index 000000000..a15da99fa
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/dailymotion.png
diff --git a/searx/static/themes/oscar/img/icons/deviantart.png b/searx/static/themes/oscar/img/icons/deviantart.png
new file mode 100644
index 000000000..cec53bcea
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/deviantart.png
diff --git a/searx/static/themes/oscar/img/icons/facebook.png b/searx/static/themes/oscar/img/icons/facebook.png
new file mode 100644
index 000000000..ac5a59493
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/facebook.png
diff --git a/searx/static/themes/oscar/img/icons/flickr.png b/searx/static/themes/oscar/img/icons/flickr.png
new file mode 100644
index 000000000..be238bb1a
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/flickr.png
diff --git a/searx/static/themes/oscar/img/icons/github.png b/searx/static/themes/oscar/img/icons/github.png
new file mode 100644
index 000000000..bf09bae55
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/github.png
diff --git a/searx/static/themes/oscar/img/icons/kickass.png b/searx/static/themes/oscar/img/icons/kickass.png
new file mode 100644
index 000000000..567d1039f
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/kickass.png
diff --git a/searx/static/themes/oscar/img/icons/openstreetmap.png b/searx/static/themes/oscar/img/icons/openstreetmap.png
new file mode 100644
index 000000000..4f88c9643
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/openstreetmap.png
diff --git a/searx/static/themes/oscar/img/icons/photon.png b/searx/static/themes/oscar/img/icons/photon.png
new file mode 100644
index 000000000..0d0732027
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/photon.png
diff --git a/searx/static/themes/oscar/img/icons/searchcode code.png b/searx/static/themes/oscar/img/icons/searchcode code.png
new file mode 100644
index 000000000..884c2660d
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/searchcode code.png
diff --git a/searx/static/themes/oscar/img/icons/searchcode doc.png b/searx/static/themes/oscar/img/icons/searchcode doc.png
new file mode 100644
index 000000000..884c2660d
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/searchcode doc.png
diff --git a/searx/static/themes/oscar/img/icons/soundcloud.png b/searx/static/themes/oscar/img/icons/soundcloud.png
new file mode 100644
index 000000000..351c8030d
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/soundcloud.png
diff --git a/searx/static/themes/oscar/img/icons/stackoverflow.png b/searx/static/themes/oscar/img/icons/stackoverflow.png
new file mode 100644
index 000000000..812176ad2
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/stackoverflow.png
diff --git a/searx/static/themes/oscar/img/icons/twitter.png b/searx/static/themes/oscar/img/icons/twitter.png
new file mode 100644
index 000000000..f71c1973a
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/twitter.png
diff --git a/searx/static/themes/oscar/img/icons/vimeo.png b/searx/static/themes/oscar/img/icons/vimeo.png
new file mode 100644
index 000000000..0238d24d2
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/vimeo.png
diff --git a/searx/static/themes/oscar/img/icons/wikipedia.png b/searx/static/themes/oscar/img/icons/wikipedia.png
new file mode 100644
index 000000000..37997fbc7
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/wikipedia.png
diff --git a/searx/static/themes/oscar/img/icons/youtube.png b/searx/static/themes/oscar/img/icons/youtube.png
new file mode 100644
index 000000000..ba2484d0f
--- /dev/null
+++ b/searx/static/themes/oscar/img/icons/youtube.png