.
Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer

Conflicts:
	js/iframeResizer.contentWindow.min.js
	js/iframeResizer.min.js
Set default sizing method to offset
setHeightCalcMethod()
Release v2.3.1
typo
Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer

Conflicts:
	js/iframeResizer.contentWindow.min.js
	js/iframeResizer.min.js
Code review
Code review
Code Review
Ensure v1 host script can call latest iFrame code
Release v2.3.2
Update ignore list
Include source maps
Code review
Automatically rewritten for npm.