converting DexResolver in propert singleton, addressing Bug #37 on github
Merge commit '550aaca69710a3c597f0a3c8a1f07a5d41359be3' into develop

Conflicts:
	src/singletons.list