.user commit
Merge branch 'master' of github.com:AlexLeSang/ECOHT-ANN

Conflicts:
	ECOHT-ANN.pro.user

Conflicts:
	ECOHT-ANN.pro.user

Merging