add charset on fdr
add tags
Merge branch 'master' of github.com:kinnou02/openbeerplanner

Conflicts:
	openbeerplanner/templates/fdr.html
add more tags
Merge branch 'master' of github.com:kinnou02/openbeerplanner
des trucs
Merge branch 'master' of github.com:kinnou02/openbeerplanner

Conflicts:
	openbeerplanner/templates/fdr.html
fix du merge
add random