717
Fa update/changes

Built audio player - can pass single path or array of paths ...
updates of activities and css
Merge remote-tracking branch 'remotes/origin/TIM_Bugs_717'
Merge remote-tracking branch 'remotes/origin/TIM_Bugs_717' into cstrama1
Fluency Accuracy - fixed not concluding while 3 team members

Added manifest.mf
updated index.html to reference manifest.mf (forces browser to reload specified non cache files)
Work Item 4490
fixed checkplan bailout
Merge remote-tracking branch 'remotes/origin/cstrama1'
Verification Cleanup
hiding and showing activities in plans 2 & 3
Merge remote-tracking branch 'remotes/origin/cstrama1'
Merge remote-tracking branch 'remotes/origin/master' into cstrama1
smex id 11
Verification Orange Flag
Merge remote-tracking branch 'remotes/origin/cstrama1'
Merge remote-tracking branch 'remotes/origin/MKamberger_7_15'

Conflicts:
	_/js/activities.js
Merge remote-tracking branch 'remotes/origin/MKamberger_7_15'

Conflicts:
	_/js/activities.js