message editing added
Merge branch 'master' of https://github.com/emocentmagar/brilliantedu into lalit

Conflicts:
	application/config/autoload.php
	application/views/includes/footer.php
	application/views/includes/header.php
Merge pull request #5 from emocentmagar/lalit

Lalit
conflict resolved