Add javadoc comment on Adapter
recup
Merge branch 'master' into antonin
Add login page
delete bin files
Merge branch 'antonin'
fixes conflict