enjoy login page
Merge branch 'kinjee-mac'