Merge pull request #208 from dizzzz/feature/upgrade_aspectj_to_support_java7

Upgrade to aspectj-1.8 to support Java7;