header modified in controller
Merge branch 'master' of https://github.com/ASRSoftware/Globalfuel
login form
Merge branch 'master' of https://github.com/ASRSoftware/Globalfuel

Conflicts:
	fuel/app/classes/controller/welcome.php