* Merge with master * Refactoring code * Add license header Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>