Changed Shami to full member
Merge branch 'master' of https://github.com/nanograv-pire/nano-web into develop

Conflicts:
	participants.html
Updating