add plugin emmet.
Merge branch 'master' of github.com:weijiahan/sublime_test_2_package

Conflicts:
	Default/Meta Info Summary.cache
	Default/Startup.cache
	Default/Syntax Summary.cache
	Sublimerge Pro/Sublimerge.pyc
	Sublimerge Pro/messages.json
	Sublimerge Pro/package-metadata.json
	Sublimerge Pro/sublimerge/sublimerge_diff_region.pyc
	Sublimerge Pro/sublimerge/sublimerge_diff_view.pyc
	Sublimerge Pro/sublimerge/sublimerge_diff_view_dirs.pyc
	Sublimerge Pro/sublimerge/sublimerge_diff_view_panel.pyc
	Sublimerge Pro/sublimerge/sublimerge_differ.pyc
	Sublimerge Pro/sublimerge/sublimerge_differ_dirs.pyc
	Sublimerge Pro/sublimerge/sublimerge_editor_commands.pyc
	Sublimerge Pro/sublimerge/sublimerge_scroll_sync.pyc
	Sublimerge Pro/sublimerge/sublimerge_utils.pyc
	Sublimerge Pro/sublimerge/version.pyc
	User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	User/Package Control.last-run
	User/Package Control.sublime-settings
	User/Preferences.sublime-settings