Initial working set
Added bean definition
Merge remote-tracking branch 'origin/master'