Trello #395

Adding logging for the change username functionality
Trello #395

Fix for entities with messaging
Merge remote-tracking branch 'origin/develop' into develop