audio test 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/addmedia.js
 upload test and alert comments