Merge remote-tracking branch 'upstream/master' into ra905
changes made to Datawalk.java to allow api changes to function probably. We are now in dev mode, the actual project number is supposed to be 156.
A service class created and the Framework for a service has been created, permissions added in Manifest
changes made in terms of services
Ended most suffering
Horrible merge conflicts are horrible
Merge pull request #999 from Rajia/ra905

Ra905
fixed data upload!
incremented apk number in androidmanifest
new PT apk 2.1.4
new PT apk 2.1.4 with correct versionCode (26)
Merge pull request #1000 from beejisbrigit/brigit_dev

fixed data upload! added new apk and changed version code in A.Manifest
more bug fixes for landscape mode pictures app
Merge pull request #1001 from bdonald25/bd859

Picture app landscape mode redone, logs in on app start