First version that works with iOS7
Merge remote-tracking branch 'origin/master'
Some fixes for iOS7
Merge remote-tracking branch 'origin/master'
iOS7 support