update CCK
update context
update filefield sources
merge
Merge branch 'feature/update-cck-3' into dev
Security updates, resolves #61
Merge branch 'release/security-20131231'

Conflicts:
	CHANGELOG.md