Merge branch 'feature/prepare-aspectj' into develop
Do not split dirs
Add src/main/aspectj to sources
Merge branch 'develop' into jdk7-jdbc-fix-aspect
AJ in proper dir