change login field text color
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/index/view_home.php