Fix compatibility with Cancan 1.6.9
1.1.3
Use asset path to jplayer.swf
1.1.4
Update omniauth-facebook

Fixes #313
Re-allow link images in strong_params
1.1.5
Merge remote-tracking branch 'upstream/1-0-stable' into 1-0-stable

Conflicts:
	base/social_stream-base.gemspec