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

Conflicts:
	rooibos/settings.py
Uncompress flowplayer JavaScript file for modifications
Remove old viewer mechanism and reimplement mediaplayer viewer to start
Fix import errors
Fix labels
Clean up embeddable viewers
Add refactored MegaZine viewer
Remove debugging print statements
Started work on resizable Megazine viewer
Skip login page if user is already authenticated

Case 7421
Allow presentation filtering on untagged presentations
Add announcement editor features
Force comma delimiter for CSV spreadsheet import
Import multiple files of same mime type for same record
Catch additional PyODBC IntegrityCheck exception
Code cleanup
Add individual record permissions to Solr index and search
Add individual record permissions to Record model