changed from phone_nr to user_id.
Merge branch 'master' of https://github.com/ader1990/smarthouse

Conflicts:
	server_app/models/model_device.js
Merge branch 'master' of https://github.com/ader1990/smarthouse

Conflicts:
	server_app/models/model_device.js