Add more videos to context zone
Improve context friends data
Merge branch 'master' of github.com:theefer/gu-2030