Adapting app for iOS 7
Merging branches