User edition by the admin added...
Merge https://github.com/IvayloGeorgiev/JokeBook
Merging