inplace
Merge branch 'inplace' of git://github.com/wakama2/dcase_viewer

Conflicts:
	index.html
	js/dnodeview.js