Merge remote branch 'origin/loadingStatus' into development
Merge remote branch 'origin/userManagement' into development
accidentally worked on the wrong branch. some beginnings for sidebar
merging all to developement and resolving conflicts
sorry fixed stuff from me sleeping yesterday