Merge remote-tracking branch 'origin/master'

submodules/devices/devices.js

@@ -546,6 +546,10 @@ define(function(require){
 					require_keypress: true,
 					keep_caller_id: true
 				}, formData.call_forward);
+
+				if (originalData.device_type === 'smartphone') {
+					formData.call_forward.failover = true;
+				}
 			}
 
 			if(hasCodecs) {

submodules/users/users.js

@@ -1037,7 +1037,7 @@ define(function(require){
 						}
 					};
 
-				if (deviceData.type === 'mobile') {
+				if (deviceData && deviceData.type === 'mobile') {
 					monster.ui.confirm(
 						self.i18n.active().users.confirmMobileUnAssignment.replace(
 							'{{variable}}',

views/devices-layout.html

@@ -13,7 +13,7 @@
 			<ul class="dropdown-menu">
 				<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
 				<li><a class="create-device" data-type="cellphone"><i class="fa fa-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>
-				<!-- <li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li> -->
+				<li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li>
 				<li><a class="create-device" data-type="softphone"><i class="icon-telicon-soft-phone"></i>{{ i18n.devices.types.softphone }}</a></li>
 				<li><a class="create-device" data-type="landline"><i class="icon-telicon-home"></i>{{ i18n.devices.types.landline }}</a></li>
 				<li><a class="create-device" data-type="fax"><i class="icon-telicon-fax"></i>{{ i18n.devices.types.fax }}</a></li>

views/users-devices.html

@@ -23,7 +23,7 @@
 			<ul class="dropdown-menu">
 				<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
 				<li><a class="create-device" data-type="cellphone"><i class="fa fa-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>
-				<!-- <li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li> -->
+				<li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li>
 				<li><a class="create-device" data-type="softphone"><i class="icon-telicon-soft-phone"></i>{{ i18n.devices.types.softphone }}</a></li>
 				<li><a class="create-device" data-type="landline"><i class="icon-telicon-home"></i>{{ i18n.devices.types.landline }}</a></li>
 				<li><a class="create-device" data-type="fax"><i class="icon-telicon-fax"></i>{{ i18n.devices.types.fax }}</a></li>