Removing association with Entity Listeners.
Merge branch 'master' of github.com:LuisLoureiro/TheCloudMediaPlayer