implements 4 types of feeds client + server
Merge branch 'master' of https://github.com/guillaume-gouchon/html5-jam

Conflicts:
	client/app/scripts/modules/production/models/comment.js