Release
Final aeDescriptor
Merge branch 'master' of https://github.com/11791-5/project-team5.git

Conflicts:
	project-team05/pom.xml
Pom submission