Merge remote-tracking branch 'origin/master'

Conflicts:
	js/eeg-module.js
Dot trios working!