QUASAR: Remove superfluous spaces from main.js
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
MERGE Conflict resolution
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration

Conflicts:
	Quasar/main.js