Merge branch 'master' of https://github.com/AftExploision/OREUtilsv2

Conflicts:
	OREPyUtils/Plots/Frontend.py
Merge branch 'master' into jsonload

Conflicts:
	OREPyUtils/Plots/Frontend.py