.
Merge branch 'master' of github.com:mwaylabs/mcapjs-client

Conflicts:
	examples/authentication/events.html