new changes
Merge branch 'master' of https://github.com/usmanshahid/FoodStall

Conflicts:
	application/controllers/User.php
	application/views/common/header.php