Dummy update: 2.4.7 / 20140221
Merge branch 'master' into public-beta

* master:
  Dummy update: 2.4.7 / 20140221

Conflicts:
	manifest.json