Fixed JokesResource
Merge https://github.com/IvayloGeorgiev/JokeBook

Conflicts:
	Client/app/controllers/jokeDetailsCtrl.js