next d media description
typo correction
Merge branch 'development' of https://github.com/makapen/makapen.github.io into development

Conflicts:
	app/index.html