# Conflicts:
#	package.json
#	src/room.js

Don't block connection on microphone, screen sharing permissions

Adding "network-counter" component- keeps track of networked entities and limits how many you can have, and how long they can live for.

Workaround for skinned mesh bug on galaxy s6 devices

Remove animation mixer

Add sentry

Update input mappings to use latest AFIM, with activators and behaviours

* Unoptimized water and skybox.

* Move waternormals texture to new assets folder

* Add cubemap skybox

* Water and skybox improvements WIP

* MobileWater shader (no reflections)

* Made water and skybox editable in aframe-inspector

* Remove cubemap component

* Load water normal map from preloaded asset for cdn compatibility.