Merge pull request #610 from andrerod/dev

Fix JSHint issues
Add missing check
remove file
Fix UT
Merge branch 'dev' into notificationmsg