My Menu Maker
Merge branch 'master' of https://github.com/infotechnab/smartaservice

Conflicts:
	application/helpers/menumaker_helper.php