Imported from master
Merge remote-tracking branch 'origin/master' into stephane
Merge branch 'master' into stephane
Customer and Employee look and feel
Employee login
Weird error