Merge github-core/develop into develop

Conflicts:
	web/lib/core/jquery.hongs.src.js