added update implmentation
Merge branch 'daofuture'
add a couple output fields in dashboard.xhtml
Merge branch 'dashboard-feature'
Merge branch 'master' into dashboard-feature
Update DAO