Merge branch 'master' of https://github.com/DrFatalis/CM15Pro_WebServer

Conflicts:
	README.md

Signed-off-by: DrFatalis <maxime.salecroix@hotmail.fr>