The UI now has two buttons: start and a stop which function properly. A 20 second time interval was also added. Still need to incorportate landscape layout containing both buttons or elso app will crash.
Fixed bug with app force closing when rotated horizontally. This was occuring because the layout in landscape was not matching that in portrait. Now app is in stable condition and has an enhanced UI! Possibly add padding to make look nicer.
test file to test local repo
Redoing DataWalk layouts
remove test file
Updated themes and functionality of DataWalk with new layout.
Fixed the login dialogs doing weird things to line up.
Merged in Rajia's UI changes, but decided to keep my UI
A few bug fixes and new layout improvements.
This version is semi-stable
Merged new layouts with Mike's
Added a color file for the text states
Merge remote-tracking branch 'upstream/master' into jp923
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.