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

Conflicts:
	rooibos/settings.py
Implement configurable upload limits per storage
Allow records to be dragged to basket
Add iPad/iPod support to media player
Merge branch 'master' into experimental
Fix presentation password issues
Exclude personal images from front page
Add streaming URL for Apple devices
Fix validation error on user administration page
Merge branch 'master' into experimental
Fix uninitialized variable in media file upload
Fix bug in file size limit check
Fix bug in tag retrieval for anonymous user
Add drag-and-drop from basket to light table
Fix missing variable initialization
Merge remote branch 'origin/experimental' into experimental
Keep track of most recently edited presentation
Change top menu item Search to Advanced Search