Merge branch 'master' into release300

Undo all NAF additions

Author: wmurphyrd

examples/events/index.html

@@ -35,7 +35,7 @@
         <img id="portals-preview" src="../assets/portals.jpg"></img>
       </a-assets>
       <a-entity progressive-controls="objects: a-box, a-torus-knot, a-link">
-        <a-camera>
+        <a-camera position="0 1.6 0">
           <a-entity class="gazecaster">
             <a-sphere radius="0.02" visible="false" shadow>
             </a-sphere>