Merge remote-tracking branch 'origin/development' into development

Conflicts:
	framework-core/src/main/java/framework/core/entity/AbstractEntity.java
Merge branch 'development' of
https://github.com/ProjectWaffle/framework.git into development