Update #37
Merge branch 'master' of https://github.com/SocialERPTelegestion/FeelTeam.com

Conflicts:
	FeelTeam/WebFolder/components/ds/TPV.waComponent/TPV.css