Merge pull request #6 in TSI/web-application-java from sync-with-cont…

…ent-bloom to develop

merging history from remote https://bitbucket.org/contentbloom/sdl-dxa-for-java

* commit 'f21bc59c90c435ed705b2153be11c2d255b1d6af': (22 commits)
  changed local config
  Fixed bug with random ordering of regions
  Removed ContentResolver code as it's now handled by other classes
  Removed handleGetPageJSON action from controller - this should no longer be used, as we don't want to leak dd4t json to the client
  Fix problem with cached requests - dd4t also caches failed broker queries (returning a null value on subsequent calls)
  Removed ContentProvider.GetPageContent (it leaks the underlying data)
  Rename EntityModel.PropertyData to XpmPropertyMetadata
  changed PageData, RegionData & EntityData to XpmMetadata
  Added RegionModelSet classes to Page Model
  added logging to file
  Refactored Page, Region and Entity - renamed to PageModel, RegionModel & EntityModel
  Renamed TRI taglib to DXA
  Added default (dummy) implementation of conditionalentityevaluator
  Added ConditionalEntityEvaluator interface
  added tridion references to tridion provider pom
  Renamed richtextprocessor and removed staticcontentprovider class and interface
  merged staticcontentprovider and contentprovider code, and renamed dd4tcontentprovider to defaultcontentprovider
  Added JSTL dependency to pom
  Fixed page title postfix - removed hardcoded space
  Commit of latest DXA source code
  ...