dev commit
Merge branch 'development' into vle

Conflicts:
	support/client/lib/vwf.js