Merge branch 'develop' into room-initial-sync

.gitignore

README.rst

demo/start.sh

docs/ancient_architecture_notes.rst

docs/architecture.rst

docs/client-server/OLD_specification.rst

docs/client-server/model/presence.rst

docs/client-server/model/profiles.rst

docs/client-server/model/protocol_examples.rst

docs/client-server/model/room-join-workflow.rst

docs/client-server/model/rooms.rst

docs/client-server/model/terminology.rst

docs/client-server/model/third-party-id.rst

docs/client-server/web/README

docs/client-server/web/files/backbone-min.js

docs/client-server/web/files/css

docs/client-server/web/files/handlebars-1.0.0.js

docs/client-server/web/files/highlight.7.3.pack.js

docs/client-server/web/files/jquery-1.8.0.min.js

docs/client-server/web/files/jquery.ba-bbq.min.js