change universe init
fix merge
sadasdasd
Merge remote-tracking branch 'origin/pliDEV' into imDev

Conflicts:
	example.py
	portfolioFactory/universe/universe.py