cambio a pycharm
Merge remote-tracking branch 'origin/master'

Conflicts:
	install_fusion.py
cambio a pycharm