Update
Merge branch 'master' into develop

Conflicts:
	bin/thorium
	lib/thorium/engine.rb
	lib/thorium/filter/code_attributes.rb
	lib/thorium/filter/embedded.rb
	lib/thorium/parser.rb
	lib/thorium/syntax_error.rb
	lib/thorium/template.rb
	test/test.thor