iOS 7 version 09/24/13
Merge branch 'Austin's-Branch'