new Job config ids
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pydio/main.py
Merge branch 'master' of http://github.com/pydio/pydio-sync