Annotation based, mysql, hib, mvc
Merge remote-tracking branch 'origin/master'