Update to newer version of confcodeofconduct.org

Author: Charlotte Spencer

codeofconduct.html

@@ -34,10 +34,10 @@ <h1>The JSConf<sup>&trade;</sup> Code of Conduct</h1>
 		<p>All delegates, speakers, sponsors and volunteers at any JSConf event are required to agree with the following code of conduct. Organizers will enforce this code throughout the event.</p>
 
 		<h2>The Quick Version</h2>
-		<p>JSConf is dedicated to providing a harassment-free conference experience for everyone, regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. We do not tolerate harassment of conference participants in any form. Sexual language and imagery is not appropriate for any conference venue, including talks. Conference participants violating these rules may be sanctioned or expelled from the conference without a refund at the discretion of the conference organizers.</p>
+		<p>JSConf is dedicated to providing a harassment-free conference experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, ethnicity, religion (or lack thereof), or technology choices. We do not tolerate harassment of conference participants in any form. Sexual language and imagery is not appropriate for any conference venue, including talks, workshops, parties, Twitter and other online media. Conference participants violating these rules may be sanctioned or expelled from the conference without a refund at the discretion of the conference organisers.</p>
 
 		<h2>The Less Quick Version</h2>
-		<p>Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, body size, race, religion, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, sustained disruption of talks or other events, inappropriate physical contact, and unwelcome sexual attention.</p>
+		<p>Harassment includes offensive verbal comments related to gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, ethnicity, religion, technology choices, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, sustained disruption of talks or other events, inappropriate physical contact, and unwelcome sexual attention.</p>
 
 		<p>Participants asked to stop any harassing behavior are expected to comply immediately.</p>
 
@@ -51,4 +51,4 @@ <h2>The Less Quick Version</h2>
 
 		<p>We expect participants to follow these rules at all conference venues and conference-related social events.</p>
 	</body>
-</html>
+</html>