Add flv switch
Merge branch 'master' of https://github.com/Jim-Murphy/GrassRoot