fixed resolve issues for current User
added 2nd locations to graph page & refactored inventory api
added 2nd locations to graph page & refactored inventory api
added filter in graph page
added new graph to profits page
added watchers to pie graphs
Merge branch 'master' into production
merging into master
pushing into production