messed with permissions and dix profile description
fix conflict display error
Merge branch 'master' of https://github.com/dcs-web-team/dcs-website