1) Fix for NullPointerException on notification/insert without deviceGuid
2) Fix for user login trimming
Merge remote-tracking branch 'origin/master'