rdv
Merge branch 'dev' of https://github.com/fduffeal/lfg into dev

Conflicts:
	app/html/controllers/rdv.html