no message
Merge branch 'master' of https://github.com/JannWencyTico/MobileDengue

Conflicts:
	application/controllers/home.php
	application/models/login_model.php
	application/views/home_view.php