Merge branch 'development' of
https://github.com/ProjectWaffle/framework.git into development

Conflicts:
	framework-core/src/main/java/framework/core/constants/ApplicationStatus.java
	framework-core/src/main/java/framework/core/entity/AbstractEntity.java
	framework-core/src/main/java/framework/core/entity/SystemParameter.java
	framework-core/src/main/java/framework/core/entity/Usergroup.java
	framework-core/src/main/java/framework/core/persistence/impl/AbstractDao.java
	framework-core/src/main/java/framework/core/service/impl/AbstractService.java
	framework-core/src/main/java/framework/core/utilities/AuditlogUtil.java
	framework-core/src/main/java/framework/core/utilities/DataGenerator.java
	framework-core/src/main/java/framework/core/utilities/DefaultDataGenerator.java