Added initial cloudspace support
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'

Conflicts:
	rooibos/settings.py
Initial check in of Desktop MediaViewer source code.
Test commit.
add {% csrf_token %} to search form in /solr/templates/results.html
Add license files
Fixed performance bug where app dies when scrub button is pressed. This is version 1.02.5.
Merge remote-tracking branch 'origin/experimental' into experimental

Conflicts:
	.gitignore
Merge branch 'mediaviewer-scrublist' into experimental

Conflicts:
	.gitignore
Merge remote-tracking branch 'gh-cit-jmu/experimental' into HEAD
Initial README.md
Merge pull request #18 from Trott/README

Initial README.md
Merge remote-tracking branch 'gh-cit-jmu/master'
Fix bug in spreadsheet import
Improve content length detection
Update README
Comment out NasaImageExchange federated search
added 'django.middleware.http.ConditionalGetMiddleware' to MIDDLEWARE_CLASSES to support client side browser caching
fix artstor results breaking because nasa search was removed