merges iOS7 branch in to develop