video tag styles and fixes to Android
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/css/style.css
Sound icons
Merge remote-tracking branch 'DR/master'
Sound icons
Sound icons