[Logic] Block and Entity added and some classes refactored
Merge remote-tracking branch 'origin/spring'

Conflicts:
	src/main/java/com/nbcuni/backend/page/AbstractPage.java
[Logic] Block and Entity added