1. Minor refactoring in SrcMLProcessor
2. Updated bean id on application context
Merge origin/master