Merge remote-tracking branch 'origin/master' into Master2

Conflicts:
	ProjAppliWeb/src/main/java/m2/project/Application.java
charts + stock
Merge remote-tracking branch 'origin/Master2'