2-1, Fixed some bug with infinite-scroll
Signed-off-by: Yoann SOLACROUP <solacroup.yoann@gmail.com>
Merge branch 'dev-2-1' into dev

Conflicts:
	www/js/event.js
	www/templates/event.html
	www/templates/event/card.html