Merge branch 'changeSMTP' of ssh://helios/home/git/repositories/Nova into changeSMTP

Conflicts:
	Quasar/NowjsMethods.js
	Quasar/main.js
	Quasar/views/includes/basicConfigForm.jade
MISC: Update documents for SMTP dependencies
Merge branch 'changeSMTP' into integration

Conflicts:
	Installer/nova_init
	Quasar/NowjsMethods.js
	Quasar/main.js
	debian/novaInstallHelper.sh
More merge conflict resolution
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration