fix bug in firefox for studio.ini parsed as XML
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/services/services.js