Fixed indentation and small fixes.
Jira issue: APPSEM-3
Added user and device info for sensors.
Jira issue: APPSEM-5