Fixed: Renamed database row in table device from module to devicetype_id
Merge branch 'beta' of https://github.com/DomotiGa/DomotiGa into beta

Conflicts:
	upgrade/10016to10017.sql
Fixed: Renamed DeviceType editor forms.