Merge branch 'philippe-branch'
Fix flop
Fix flop2
Added login page