Merge ~ltrager/maas:favicon into maas:master

[Lee Trager]

LP: #1738127 Add favicon to the UI

[Newell Jensen (newell-jensen)]

+1

review: Approve

diff --git a/src/maasserver/static/assets/images/icons/maas-favicon-32px.png b/src/maasserver/static/assets/images/icons/maas-favicon-32px.png
new file mode 100644
index 0000000..d4d6e2f
Binary files /dev/null and b/src/maasserver/static/assets/images/icons/maas-favicon-32px.png differ
diff --git a/src/maasserver/templates/maasserver/base.html b/src/maasserver/templates/maasserver/base.html
index 3bf942b..8afbaa1 100755
--- a/src/maasserver/templates/maasserver/base.html
+++ b/src/maasserver/templates/maasserver/base.html
@@ -14,7 +14,7 @@
     <base href="{% url 'index' %}">
     <title>{% block title %}{% endblock %} | {% include "maasserver/site_title.html" %}</title>
 
-    <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/logos/favicon.ico">
+    <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/icons/maas-favicon-32px.png">
 
     <!-- stylesheets -->
     {% block css-conf %}
diff --git a/src/maasserver/templates/maasserver/index.html b/src/maasserver/templates/maasserver/index.html
index bc6e679..a9c03cf 100755
--- a/src/maasserver/templates/maasserver/index.html
+++ b/src/maasserver/templates/maasserver/index.html
@@ -14,7 +14,7 @@
     <base href="{% url 'index' %}">
     <title data-ng-bind="title + ' | ' + site + ' MAAS'"></title>
 
-    <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/logos/favicon.ico">
+    <link rel="shortcut icon" href="{{ STATIC_URL }}assets/images/icons/maas-favicon-32px.png">
 
     {% include "maasserver/css-conf.html" %}
 </head>