Resolve some merge errors
Merge branch 'master' of https://github.com/martinsmas/Work_Arqsi_php
Fixing repository errors