add phpci config
add atlassian file to ignore conf
Merge branch 'develop'

Conflicts:
	phpci.yml