edit login
Merge branch 'master' of https://github.com/nattaponwora/t-alert

Conflicts:merge done
	application/models/temp_model.php