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

Conflicts:
	pyacq/core/devices/__init__.py

Emotiv multi stream
Merge branch 'master' of github.com:samuelgarcia/pyacq
Merge pull request #3 from Lx37/master

Emotiv multi stream