Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs

@@ -73,9 +73,9 @@
                         click
                         <b>"View Certificate List"</b> to complete the process and go back to the certificate list.
                         <hr/>
-                        <button class="wr-btn" onclick="window.location.href='/emm/certificates'">View Certificate List
+                        <button class="wr-btn" onclick="window.location.href='{{@app.context}}/certificates'">View Certificate List
                         </button>
-                        <a href="/emm/certificates/add" class="cu-btn-inner">
+                        <a href="{{@app.context}}/certificates/add" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.hbs

@@ -43,7 +43,7 @@
                 <i class="fw fw-mobile fw-3x"></i>
             </h3>
             <h3 class="text-muted">No device type is available to be displayed.</h3>
-            <a href="https://docs.wso2.com/display/IoTS100/Quick+Start+Guide" target="_blank"
+            <a href="https://docs.wso2.com/display/IoTS300/Quick+Start+Guide" target="_blank"
                class="btn-operations btn-default">
                 <span class="fw-stack">
                     <i class="fw fw-ring fw-stack-2x"></i>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs

@@ -17,8 +17,8 @@
 }}
 {{#zone "footer"}}
     <p>
-        <span class="hidden-xs">WSO2 Carbon Device Management Framework v1.1.3</span>
+        <span class="hidden-xs">WSO2 Carbon Device Management Framework v2.0.6</span>
-        <span class="visible-xs-inline">WSO2 CDMF v1.2.6</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
+        <span class="visible-xs-inline">WSO2 CDMF v2.0.6</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
         <a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All Rights Reserved.
     </p>
 {{/zone}}