Added context permission module
Adde field_collection and field_collection_table modules
changed field collection version
is now dependent on stanbellcom repo not os2web
changed branches
fixed formatting
Settings translations added
Changed translation file url
Removed file lock module
updated da.po file, testing the encoding
translation changes
text changes
text changes
text changes
bug fix
context_permissions bug fix
translation added
Merge branch 'syddjurs'

Conflicts:
	da.po
	os2dagsorden.make