Changed directory structure
Updated maven dependencies
Annotation-based app configuration
Merge remote-tracking branch 'origin/master'