add dummy audio driver for Quintus
Merge branch 'fix-tests'
add shield
Merge branch 'master' into aliens2

Conflicts:
	app/scripts/main.js
	app/scripts/models.js
	app/scripts/scenes.js