deleting testing stuff
Merge branch 'master' of https://github.com/nelii28o2/wavesphere-gui.git
stuff
added xbee stuff
Merge remote-tracking branch 'origin/master' into test
Merge remote-tracking branch 'origin/test' into test
Merge branch 'master' of https://github.com/nelii28o2/wavesphere-gui.git
into test

Conflicts:
	WaveSphere/.classpath