adding aop in api-servlet.xml
merging
Merge branch 'master' of https://github.com/mmpereira/spring-api.git

Conflicts:
	src/main/java/com/genebio/nextprot/controllers/PublicationController.java