Merge branch 'release-0.6.2'
properly escaping the HTML for the code view
properly escaping the HTML for the code view
updating notes on this release
Merge branch 'release-0.6.3'
don't replace the iframe window if it's a hash
noting the changes in v0.6.4
Merge branch 'release-0.6.4'
fixing the conflicts when merging branch 'release-0.7.0'

Conflicts:
	CHANGELOG
	builder/builder.php
	builder/lib/builder.lib.php
	builder/lib/generator.lib.php
	core/templates/styleguide.mustache
	core/templates/viewall.mustache
	public/styleguide/js/code-viewer.js
Merge branch 'release-0.7.0'
Merge branch 'release-0.7.0'
Merge branch 'release-0.7.0'
cleaning up some cruft from the massive merge
fixing a bug with the migrator
Merge branch 'master' into release-0.7.0
Merge branch 'release-0.7.0' into dev