new implementations
Merge branch 'master' of https://github.com/ViepakTech/HalalFoodAdmin

Conflicts:
	war/HalalFoodAdmin.html