[Logic] Block mock updated
Merge remote-tracking branch 'origin/spring'

Conflicts:
	src/main/java/com/nbcuni/utils/Block.java
[Logic] Block and ElementType updated