Added Timer to GPS page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	workspace/testing/bin/Open_Page.apk
	workspace/testing/bin/classes.dex
	workspace/testing/bin/classes/com/example/testing/MainActivity.class
	workspace/testing/bin/classes/com/example/testing/R$id.class
	workspace/testing/bin/resources.ap_
	workspace/testing/gen/com/example/testing/R.java
Set Page Backgrounds to White
Changed Login Weight input to only show Numbers
Changed Login Weight input to only show Numbers
Merge pull request #25 from mschaddel/master

Removed Alarm button
put it together with the updated version.  Works.
Merge pull request #26 from thehabes/master

put the new version together with Bryans updates.
Fixed Conflicts
Merge pull request #27 from jwisch91/master

Beta Package
Merge pull request #28 from mschaddel/master

Updated Backlog
Merge pull request #29 from mschaddel/master

Updated Backlog
Exit, Confirmation, Popups, etc

Lots of little changes.
Major change was the popup which can now be applied to anything using
the same format as what I made. Spent a good 5 hours on it haha.
Bug Fix

Fixed main page bug where it looked wrong while held in horizontal view.
Added scroll capability to settings page.
Added files