Android Information from before consolidation merge.
Merge branch 'master' of github.com:EJEHardenberg/GreenUp
Merge branch 'master' of github.com:EJEHardenberg/GreenUp