fixed merge conflict
added add address and save
added list from db
Merge pull request #1 from merivainio/login added login