APD-217: login page, Layout and design
Merge branch 'APD-217' into develop