adding dao
merge conflicts
Fixing
using angular js for login
Merge pull request #1 from java-link/shishir

Shishir