aaa
Merge branch 'master' of https://github.com/tdimeco/AL-POC

Conflicts:
	Client/src/main/java/polytech/al/client/App.java