Including all valid HTML elements ordering by 'prefix' alphabetically
Merging and fixing conflicts
Merge pull request #11 from guivinicius/master

Including all valid HTML elements ordering by 'prefix' alphabetically
Prepare 0.12.0 release
Merge branch 'master' of github.com:atom/language-html

Conflicts:
	snippets/language-html.cson