stage 1 mediaplayer
Merge branch 'multimediaViewer'
changes to db
display media player
mutlimedia display working now
removed some test mediafiles
Merge remote-tracking branch 'upstream/master'

Conflicts:
	MPPMS/src/Data/MPPMSDatabase
Resolved merge conflicts.