Friay work
Merge branch 'webAp' of github.com:AppIterate/DjangoServer into webAp