Code fix
Merge branch 'master' of https://github.com/Jayadev6191/Rcians

Conflicts:
	application/controllers/meals.php
Merge branch 'master' of https://github.com/Jayadev6191/Rcians