tweeks
fix
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
Activate SMS
Merge branch 'master' into feature/User_Management

Conflicts:
	application/models/users.php
ad
orders
validate U
tweaks
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
finalizing on importing stock
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
user menu fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2