changes in conflict
Merge branch 'master' of https://github.com/infotechnab/smartaservice

Conflicts:
	application/views/templates/content.php