Lots of updates to AdminPortal and main Android app
Revert "Lots of updates to AdminPortal and main Android app"

This reverts commit 063f4f96f61460413d578d793d1cf16125f83a0b.
Merge branch 'master' of https://github.com/MrBean355/KinderFinder
Updated files after merge