Ma version forum bapt
Merge branch 'master' of https://github.com/EagleProject/Eagle-WebClient

Conflicts:
	Views/login.html