Merge origin/master

Conflicts:
	VWR/public_html/index.html
	VWR/public_html/js/app.js
	VWR/public_html/js/controller.js