html5 audio fix
Merge origin/gh-pages into gh-pages

Conflicts:
	app.js