premerge SFML 2.1
update SFML to 2.1