added patch to views php
Added file lock module
Merge branch 'dev' of https://github.com/bellcom/os2dagsorden-deploy into ballerup
	Merge branch 'ballerup' of https://github.com/bellcom/os2dagsorden-deploy into ballerup

Conflicts:
	os2dagsorden.info