fix bugs
fix some service issues, add some new features
Merge branch 'master' of https://github.com/nweber/generator-dp
Merge remote-tracking branch 'upstream/master'