update master to Summer14