Merge remote-tracking branch 'origin/Aspects'

Conflicts:
	API/src/main/java/project/pa165/musiclibrary/aspect/ExceptionTranslationAspect.java
	API/src/main/java/project/pa165/musiclibrary/aspect/LoggingAspect.java
	api/src/main/java/project/pa165/musiclibrary/aspect/ExceptionTranslationAspect.java
	api/src/main/java/project/pa165/musiclibrary/aspect/LoggingAspect.java
	business-logic/src/main/java/project/pa165/musiclibrary/aspect/ExceptionTranslationAspect.java
	business-logic/src/main/java/project/pa165/musiclibrary/aspect/LoggingAspect.java
Merge remote-tracking branch 'origin/master'