Added filtering by type(tag)
Merge https://github.com/IvayloGeorgiev/JokeBook

Conflicts:
	Client/app/views/home.jade
	Client/app/views/joke-details.jade