fix problem with online videos not playing correctly. Also fix
nullpointerexception on data creation from external database.
Merge branch 'master' of https://github.com/everetw/Clemson-Physical.git

Conflicts:
	src/edu/clemson/physicaltherapy/datamodel/ExerciseAnnotation.java