Merge branch 'develop' into stable

			<version>${aspectj.version}</version>

			<scope>test</scope>

		</dependency>

		<!-- Removes startup warning regarding annotations that aren't annotations -->

		<dependency>

			<groupId>jakarta.transaction</groupId>

			<artifactId>jakarta.transaction-api</artifactId>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>

			<artifactId>spring-tx</artifactId>

		</dependency>

	</dependencies>

	<build>