...
Merge branch 'master' of https://github.com/Amooti/SensorStream

Conflicts:
	MavenStorm/.idea/workspace.xml
	MavenStorm/MavenStorm.iml
...