Merge remote-tracking branch 'simong/paris2013-documentviewer' into paris2013
Merge remote-tracking branch 'simong/paris2013-documentviewer' into paris2013
(Paris2013) Only show previews for file content items
Merge branch 'paris2013' of github.com:sakaiproject/3akai-ux into paris2013

Conflicts:
	node_modules/oae-core/activity/activity.html