#JC-1188 Property from resources was renamed.
#JC-1188 Changes for AOP were reverted.
Merge branch 'master' of git@github.com:jtalks-org/jcommune