* commit '76943664':
  ZP-1085 Merged ServiceUnavailableException from develop and updated header.
  ZP-1085 Fix whitespace.
  ZP-1085 Fixed TRADEMARK file enconding (UTF-8).
  ZP-1085 Update file headers.
  ZP-1085 Update file headers.
  ZP-1085 Updated LICENSE and added TRADEMARKS file.