add functional test
add functional test
Merge remote-tracking branch 'upstream/master' into save

Conflicts:
	RcmAdmin/public/js/admin/rcm-admin.js
add functional tests
add functional tests
Merge remote-tracking branch 'upstream/master' into save
fix brightcove editor player
Merge pull request #214 from rodmcnew/save

fix brightcove player editor