Merge branch 'development' into adminpages
Merge branch 'adminpages' of https://github.com/Harvesters/Nutrition into adminpages
clean up code
Merge branch 'adminpages' of https://github.com/Harvesters/Nutrition into adminpages
Updates to time-picker
Menu active testing
Merging changes to resolve conflicts