MIT License
Merge branch 'master' of github.com:astorm/LayoutViewer

Conflicts:
	app/code/local/Alanstormdotcom/Layoutviewer/Model/Observer.php