Start from skeleton
Merge origin/master

Conflicts:
	POC_Project/src/main/webapp/index.html