ios7 update

1) update for ios7
2) changes in project file after bloody merge