ignore update
config renamed and ignored
Merge branch 'master' of git@github.com:glastopf/phpox.git

Conflicts:
	.gitignore
	apd_sandbox.cfg