add col to current stock status report
updating psi reports for generic location hierarchy
more
done?
bugfixes
Merge branch 'master' into commtrack
i18n
Merge branch 'commtrack' into staging2