Login work locally (account: admin, password: admin)
Merge branch 'Alexandre' into dev