Revert "Update-20140618"

This reverts commit 408c1066d7c31a8a31dd97b6d927696f4f47ca90.

Conflicts:
	json/data.json