CRUD - dao, service, spring mvc, mysql - hibernate,
Merge remote-tracking branch 'origin/master'