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

Conflicts:
	js/iframeResizer.contentWindow.min.js
	js/iframeResizer.min.js
Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer

Conflicts:
	js/iframeResizer.contentWindow.min.js
	js/iframeResizer.min.js
Code review