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
Fixed Conflicts
Merge pull request #27 from jwisch91/master

Beta Package