Merge pull request #614 from andrerod/dev

Fix UT
Merge pull request #616 from andrerod/dev

Fix require
Merge pull request #617 from andrerod/dev

Fix casing issue
Fix jshint issue
Merge branch 'dev' into notificationmsg