Configurable flowplayer versions.
Configurable flowplayer versions.
Merge branch 'master' of git.ccnmtl.columbia.edu:sherdjs into develop

Conflicts:
	build.sh
2.1 for develop