test file to test local repo
remove test file
updated file names to PendulumTracker* etc. / general cleanup
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into brigit_dev

Conflicts:
	Android/PendulumTracker/src/edu/uml/cs/isense/pendulum/LoginActivity.java
	Android/PendulumTracker/src/edu/uml/cs/isense/pendulum/PendulumTrackerActivity.java
Updated API::jsonDataUpload calls, etc.
commit which replaces API.hasConnectivity with Connection equivalent (i think)
Revert "remove test file"

This reverts commit eb20ff858e7c60c7897dbf2a5b5e3f717e195797.
Revert "commit which replaces API.hasConnectivity with Connection equivalent (i think)"

This reverts commit dfaf809897c1a0d4489ea4f9ccdd01aebffd42e6.
Revert "Revert "remove test file""

This reverts commit 81cd1e4746e9a1c4c25dbf79aa25c1bc36e35b53.
Revert "Revert "commit which replaces API.hasConnectivity with Connection equivalent (i think)""

This reverts commit 2c40fec60d3c9a9a2d1947031e32797ab90ceb7d.
Revert "removed usernames from Android API"

This reverts commit 05d90ddfa2a251c283ca271fafe06c38bd96db85.
reverting to ColorBlobDetect*java
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into brigit_dev
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into brigit_dev
add test dir foo
removed test dir test
added after rebuilding project from master
cleaned up and renamed files
stuff
Merge pull request #983 from bdonald25/bd859

Bd859