Commit
Merge branch 'master' of https://github.com/EmileDu/Web_Doc

Conflicts:
	Build/assets/js/main.min.js
	assets/js/main.min.js