merging move_webapp_to_new_api into dev
theres conflicts in .DS_STORE and I dont care
Merge branch 'develop' of https://github.com/EJEHardenberg/GreenUp into develop