Resolved Merge Conflicts - Master branch is now iOS 6 and iOS 7 compatible.