merge
using local nguidep_development db
Merge branch 'master' of github.com:lunas/nduoidep