Master: Move to SFML 2.1
Master: Transition complete to xcode