fix git repo
Merge branch 'configurator' into resource-audio

Conflicts:
	templates/sewi/index.html

Merge
index.html update
Audio Component Update
1. Added Django backend model
2. Added some simple code for audioresourceviewer
Audio Update
Merge remote-tracking branch 'origin/resource-video' into resource-audio

Conflicts:
	static/sewi/js/app/resourceGallery.js
Added Media Control
Merge remote-tracking branch 'origin/resource-video' into resource-audio

Conflicts:
	static/sewi/js/app/common.js
Audio Resource Update
1.Added skeleton eventlistener functions for the XMLHttpRequest
Audio Resource Viewer Update
1. Added Progress Bar class that can be shared by all other media components
2. Added event listeners.
3. Instead of using Audio Class to load the audio file from server, it is now using XMLHttpRequest to get the file from server.
Added error checking for progress bar
Audio Resource Viewer Update
1. Added audio control events
Audio Resource Viewer Update
Audio Resource Viewer Update
1. Play and Pause is working correctly as intended
2. Moving slider will now update the offset
Added volume control events to audio resource viewer
Minor changes to audioResourceViewer
Merge remote-tracking branch 'origin/master' into resource-audio

Conflicts:
	static/sewi/css/imageResourceViewer.css
	static/sewi/css/style.css
	static/sewi/js/app/common.js
Time elapsed is now shown on the media control
Audio Resource Viewer Update
1. Added a error screen class
2. some code refractor
3. renamed the progressbar.js to progressBar.js
Added new libraries to support visualization of time series graph
1. Added d3.min.js
2. Added rickshaw.min.js
3. Added richshaw.min.css