Merge pull request #161 from khfayzullaev/patch-2

Prevent adding devices with same ids
Fix code formatting
Update DataServiceImpl.java
Merge pull request #3 from khfayzullaev/patch-1

Patch 1