Add data- prefix to custom data attributes
Merge branch 'master' of github.com:edina/fieldtrip-open

Conflicts:
	src/www/js/ui.js