Merge pull request #96 from jesusOmar/dev

Close #95
Include the login form in the login modal window

Fixes #97

Signed-off-by: Jesus Fernandez <jesus.fndz@gmail.com>