Merge of develop.
Pre-release version of 0.9.3.0

Conflicts:
	controller.py
	dialogs.py
	diwavars.py
	doc/_build/doctrees/add_file.doctree
	doc/_build/doctrees/api.doctree
	doc/_build/doctrees/bugs.doctree
	doc/_build/doctrees/controller.doctree
	doc/_build/doctrees/environment.pickle
	doc/_build/doctrees/features.doctree
	doc/_build/doctrees/filesystem.doctree
	doc/_build/doctrees/index.doctree
	doc/_build/doctrees/macro.doctree
	doc/_build/doctrees/models.doctree
	doc/_build/doctrees/send_file.doctree
	doc/_build/doctrees/swnp.doctree
	doc/_build/doctrees/utils.doctree
	doc/_build/html/.buildinfo
	doc/_build/html/_sources/api.txt
	doc/_build/html/_sources/controller.txt
	doc/_build/html/add_file.html
	doc/_build/html/api.html
	doc/_build/html/bugs.html
	doc/_build/html/controller.html
	doc/_build/html/features.html
	doc/_build/html/filesystem.html
	doc/_build/html/genindex.html
	doc/_build/html/index.html
	doc/_build/html/license.html
	doc/_build/html/macro.html
	doc/_build/html/models.html
	doc/_build/html/objects.inv
	doc/_build/html/py-modindex.html
	doc/_build/html/search.html
	doc/_build/html/searchindex.js
	doc/_build/html/send_file.html
	doc/_build/html/swnp.html
	doc/_build/html/ui.html
	doc/_build/html/utils.html
	doc/_build/latex/DiWaCS.aux
	doc/_build/latex/DiWaCS.idx
	doc/_build/latex/DiWaCS.ilg
	doc/_build/latex/DiWaCS.ind
	doc/_build/latex/DiWaCS.log
	doc/_build/latex/DiWaCS.out
	doc/_build/latex/DiWaCS.pdf
	doc/_build/latex/DiWaCS.synctex.gz
	doc/_build/latex/DiWaCS.tex
	doc/_build/latex/DiWaCS.toc
	doc/api.rst
	doc/controller.rst
	filesystem.py
	logging.conf
	models.py
	setup.iss
	swnp.py
	utils.py
	wos.py
	wos_setup.py