Database
DAO
Services
User Login
Detail page
Merge branch 'master' of https://github.com/joelbyler/less.do

Conflicts:
	Less/war/index.html
	Less/war/js/main.js