Blocked.java and Library.java added to entities.
Merge origin/master