Merge branch 'master' of github.com:samuelgarcia/pyacq

Conflicts:
	pyacq/core/devices/__init__.py

Emotiv multi stream