Merge branch 'master' of https://gitlab.com/dreal-datalab/exploration-lettre-eolien-pv-trim

# Conflicts:
#	server.R
#	ui.R