Changes in the Admin Trend Page
Recommit
Merge with Jack
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Stocking Levels Error
User Activities Download
User Activities Download
Merge branch 'develop' of https://github.com/CodeKlerk/HCMPv2

Conflicts:
	.gitignore fix
ignore
User Activities
Merge with Jack
fix
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Log
Merge branch 'master' of https://github.com/CodeKlerk/HCMPv2

Conflicts:
	.gitignore fic
1255
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
user stats
no message