fix login area
Merge branches 'master' and 'master' of https://github.com/huynt57/SE2014---Group-5---K57CA---UET

Conflicts:
	protected/runtime/application.log