added a check for the file_parent which makes sure it always gets set
Merge branch 'master' of github.com:web2project/web2project