Add embedded config
Merge remote-tracking branch 'origin/tea' into tea

Conflicts:
	Gruntfile.js
Merge remote-tracking branch 'origin/tea' into tea