Extend timer
Update description
Fix margin
.
Increased locked timer to 128 and improved logging
Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer

Conflicts:
	README.md
	bower.json
	js/iframeResizer.contentWindow.min.js
	js/iframeResizer.min.js
	src/iframeResizer.contentWindow.map
Merge branch 'master' of https://github.com/davidjbradshaw/iframe-resizer
Release v2.5.2