Dashboard added, login modified
Merge conflicts