wpi
Merge branch 'feature/users' of https://github.com/alvaromorales/vitamin into feature/reports
fixed aggregator so that it mostly works now
moved data aggregate route
added data tab
Merge branch 'develop' of https://github.com/alvaromorales/vitamin into develop