master page in progress
master and login in one page
Merge branch 'develop' of github.com:mmm-apps/e-school into develop