to match upstream/master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/ui/js/Api.js
	test/src/ui/js/test_Api.js
add folder to store images for wiki pages, plus some images