Merge origin/master

Conflicts:
	LICENSE
Commiting Web Folder Back