Merge branch 'milestone-2' into 'OrderTest'

# Conflicts:
#   BusinessLayer/Services/BookService.cs
#   BusinessLayer/Services/Interfaces/IBookService.cs
#   WebAPI/Controllers/BooksController.cs