DeviceModelFactory added
travis fix
Merge branch 'develop' into localization