Entity views add
Merge branch '007-bl-theme' into develop