Add lines functionnality
merge branch
Merge branch 'master' of https://github.com/stationnement-quebec/stationnement-quebec

Conflicts:
	public/settings.js