Merge branch 'feature/banner-imagemap' into dev
Merge branch 'release/sprint-26' into dev
format of changelog
rename CHANGELOG to HISTORY to avoid conflict with Drupal CHANGELOG file
update entity
update contrib and core
more images
Merge branch 'dev' of brie:/srv/www/uft.claudinechionh.net/htdocs into dev
56762396 try to clean up image map coordinates
56762396 update image map coordinates in banner_imagemap box
Merge branch 'hotfix/imagemap-coords'
Merge branch 'hotfix/imagemap-coords' into dev

Conflicts:
	.gitignore
changes for sprint 30
Merge branch 'release/sprint-30'
Merge branch 'release/sprint-30'
Merge branch 'master' of brie:/srv/www/uft.claudinechionh.net/htdocs