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