joined the flatplayer dev files with the master project