adding aspect
adding junit dependencies
Merge branch 'master' of https://github.com/mmpereira/services.git

Conflicts:
	pom.xml