Some changes got XCode5.1
Fixed conflicts