More work on the joke details controller, currently resource connection is not working properly.
Merge branch 'master' of https://github.com/IvayloGeorgiev/JokeBook

Conflicts:
	Client/app/controllers/jokeDetailsCtrl.js