Merge github.com:mtian/EmberAppKitFull

Conflicts:
	.gitignore
	README.md