no message
Merge branch 'master' of https://github.com/mruslanhafiz/RPL

Conflicts:
	application/views/login.php
	application/views/main.php