Xcode changes
Merge remote-tracking branch 'upstream/master'
sync with upstream:
Merge remote-tracking branch 'upstream/master' into tim
Fix buttons on iOS5
Merge pull request #3 from KurtWagner/tim

Fix iOS5 buttons