rebasing modal_login branch with master
merging modal login branch with master