merge amp-0.9 version

merge amplab hive amp-0.9-20130517 version