ignore php errors file
Merge branch 'dev' into brad_dev
Merge branch 'brad_dev' into dev