==
Merge branch 'master' of https://github.com/andy-inc/omnis.core

Conflicts:
	.gitignore
	package.json