Introduced DeviceEquipmentService, DeviceController refactored, removed all dao classes from there
Merge remote-tracking branch 'origin/master'