Merge branch 'development' into 'xapi-kit'

Conflicts:
	support/client/lib/index.html
Fixed scoping issues