Merge remote-tracking branch 'upstream/master'

Conflicts:
	OREPyUtils/PersistentData/__init__.py
	OREPyUtils/Plots/Frontend.py
O#
Failed bugfix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	OREPyUtils/Plots/Map.py
Merge branch 'master' of https://github.com/AftExploision/OREUtilsv2

Conflicts:
	OREPyUtils/Plots/Frontend.py